TRUNK-3564 - Fixed AddressTemplate not updating properly on global property changes
(cherry picked from commit c6ad6d9d9205373dead7d1bd7fda21bfde7e6320)