Bug 1081731 - Locales follow-up, use brandShortName