Merge pull request #18048 from mikehenrty/bug-987458-queuemozapps

Bug 987458 - [B2G][Calendar] Only one alarm will fire and only one notif...
Conflicts:
	apps/calendar/js/notification.js
	apps/calendar/test/marionette/alarm_test.js
Merge pull request #18162 from mikehenrty/bug-987458-1.4rebase

Merge pull request #18048 from mikehenrty/bug-987458-queuemozapps