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

As always, comments and discussion are in the bugzilla bug

https://bugzilla.mozilla.org/show_bug.cgi?id=1004099