TRUNK-4499: AddressTemplate should not display default when the changes ...

...are invalid