Bug 871072 - Update supl server url r=fabrice
Merge pull request #9577 from lightsofapollo/notification-wake-lock

Bug 867652 - Hold CPU locks until notification is dispatched.
Conflicts:

	apps/calendar/js/controllers/alarm.js
	apps/calendar/test/unit/controllers/alarm_test.js
Merge pull request #9500 from lightsofapollo/calendar-oauth

Bug 867747 - Calendar oauth
Conflicts:

	apps/calendar/js/ext/caldav.js
	apps/calendar/js/presets.js
	apps/calendar/js/views/modify_account.js
Merge pull request #9650 from KevinGrandon/bug_868197_account_delete_flow

Bug 868197 - Oauth account delete flow r=lightsofapollo
Merge pull request #9692 from gaye/bug-870134

Bug 870134 - Redirect back to the account select view when we get access_denied
Merge pull request #7912 from lightsofapollo/calendar-server-color

Bug 836780 - Use a default color when server does not send one.
Conflicts:

	apps/calendar/test/unit/views/week_test.js
Bug 858416 - Test gaia app for exercising device storage.

Also adjusts the settings app to use storageName instead of volumeName
since bug 858416 renamed this field.
(cherry picked from commit fdfee79fa78b767ccf4241e9e525d5e5849a8c6f)
Bug 870689 - Try HSP if HFP does not work