Bug 962299 - Bundle account data into a single userdata field and add profile tracking. r=nalexander
Bug 962320 - User per-profile prefs for FxA, and store token server in account object. r=nalexander
Bug 962299 - Follow-up: safety improvements and fixes. r=trivial
Merge m-c to s-c, certainly nothing to do with Australis.