TRUNK-3564 - Fixed AddressTemplate not updating properly on global prope...

...rty changes