Bug 874389 - Recovering the provider
Merge pull request #9904 from lodr/bug-874389-recovering-provider

Bug 874389 - Recovering the provider
Merge pull request #9825 from lightsofapollo/alarms-hotfix

Bug 850850 - Add additional safe gaurds to ensure alarms fire r=kgrandon(cherry picked from commit 08c3ee81771299b4d8b5517da871bb2a08cc3647)
Merge pull request #9886 from KevinGrandon/lightsofapollo-oauth-clear

Bug 871894 - Clear cookies prior to displaying oauth2 r=kgrandon, gaye(cherry picked from commit 9578b27154645c390c41982f9d9a0113e46a6245)
Merge pull request #9777 from askeing/Bug_867031

Bug 867031 - [CustomizeUI] Cannot preload contacts during build time, r=@timdream
Conflicts:

	Makefile
Merge pull request #9916 from askeing/v1.0.1

Merge pull request #9777 from askeing/Bug_867031