Bug 1081731 - Locales follow-up, use brandShortName +autoland

https://bugzilla.mozilla.org/show_bug.cgi?id=1081731