TRUNK-4354: Retired Location Attributes are shown when editing a Locatio...

...n or adding a new Location