Bug 1004099 - FxA Settings app - remove refs to 'accountId', replace with 'email'. r=arthurcc
Merge pull request #18840 from 6a68/bug-1004099-fxa-settingsapp-remove-accountId

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