Bug 831697 - White screen after receive a call in FTE
Merge pull request #9752 from fcampo/whiteScreen-v1Train

Bug 831697 - White screen after receive a call in FTE (r=etienne)
Merge pull request #9580 from KevinGrandon/bug_867781_calendar_build_credentials

Bug 867781 - Move calendar configuration into distribution file. r=lightsofapollo(cherry picked from commit 0fc065f184e5622a24131956e5b935ebad6bfb2f)

Conflicts:
	apps/calendar/README.md
	apps/calendar/js/presets.js
Merge pull request #7913 from lightsofapollo/calendar-interop-prodid-version

Bug 836784 - Fix various interop issues with servers by sending PRODID &...
Merge pull request #9652 from lightsofapollo/improve-error-handling

Bug 867748 - Error recovery from account settings (mostly for oauth2)
Conflicts:

	apps/calendar/js/views/advanced_settings.js
	apps/calendar/js/views/modify_account.js
	apps/calendar/style/modify_account_view.css
	apps/calendar/test/unit/view_test.js
Merge pull request #9693 from lightsofapollo/notify-on-sync-error

Bug 870664 - Send notification when account fails to sync r=kgrandon (tests/lint pass locally)
Conflicts:

	apps/calendar/test/unit/controllers/alarm_test.js
Merge pull request #9772 from lightsofapollo/only-persist-existing

Bug 872220 - Only mark permanent errors on existing accounts r=gaye
Merge pull request #9771 from lightsofapollo/use-moz-anon-again

Bug 872215 - Fix regression when mozAnon was removed.
Merge pull request #9564 from xiupinglong/master

Bug 861097 - [Buri][Beetle lite FF]The phone display date on status after power off animate  r=Alive(cherry picked from commit 74e702aa11ab85d15ddf9ca783de76e8dc498b14)
Merge pull request #9628 from mozsquib/email-fix-account-creation

Bug 870042 - Impossible to create more than one e-mail account(cherry picked from commit 76ee46e0d4a05b3e7624994f439391a3a4572944)
Merge pull request #9711 from huchengtw-moz/settings/Bug_868908_Layout_is_nok_on_german

Bug 868908 - [Buri][Translation][NITZ] Lay out is NOK on German.(cherry picked from commit 49a00e9a975b9b005cfbfe1dfea852cc154c4343)
Bug 869859 - [Video] support mimetype of video/ogg for all web activities r=dkuo
(cherry picked from commit c0213ef9920a247cd61db129018a492a605d0b61)
Merge pull request #9689 from davidflanagan/bug828237

Bug 828237 - changing language should also switch default keyboard r=@davidflanagan,@RudyLu(cherry picked from commit a1cf4de967a4a8231c4dfd34d5da118047100b31)

Conflicts:

	apps/keyboard/js/keyboard.js
Merge pull request #9801 from davidflanagan/bug828237-v1-train

Merge pull request #9689 from davidflanagan/bug828237