Bug 1004099 - FxA Settings app - remove refs to 'accountId', replace with 'email'