The PropertyManager::Expand() method is not optimized

[end2endzone]

The actual implementation is browsing through all known properties and processes a "search and replace" in the given string. This is not optimized. The algorithm is getting slower and slower as we create more properties.

The PropertyManager::Expand() method should be optimized to search for ${...} patterns inside the string and replace the content as required.

[end2endzone]

The new implementation also have a possible infinite loop issue. The code was also modified to protect the software from infinite loops when trying to expands property references that forms a circular reference.