Bug 936727 - Garble account name that is logged by UpgradeReceiver. r=rnewman
Merge branch 'develop' into elm