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)