Bug 956442 - Include version in desktop Sync client records. r=gps
Merge m-c to s-c
Bug 956935 - Include supported Sync protocol versions in Android client records. r=nalexander

--HG--
extra : amend_source : 67f9f5156f6e7a39a056cd5ef145a4fd10ec0b74
Bug 956935 - Follow-up: Fix bustage. r=me
Bug 956816 - Implement (de)serializing Android BrowserIDKeyPair instances. r=rnewman
Bug 955808 - Implement Android Firefox Account client that speaks "onepw" protocol. r=rnewman
Bug 955808 - Follow-up: Fix bustage. r=me
Merge m-c to s-c
Bug 956936 - Include supported Sync protocol versions in desktop client records. r=gps
Merge m-c to s-c.
Merge m-c to s-c.