Merge pull request #17839 from cvan/updated-mkt

Bug 989470 - Fix MCC/MNC dual SIM detection in Marketplace app
r=julien
(cherry picked from commit 5d81c713215ee1b97996e0bedff87dcd14309eec)
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
Bug 994630 - [1.4] Fix failure in test_receive_active_sync_email.py
Merge pull request #18169 from viorelaioia/bug_994630

Bug 994630 - [1.4] Fix failure in test_receive_active_sync_email.py
Merge pull request #18068 from julienw/989470-v14-marketplace-package

Merge pull request #17839 from cvan/updated-mkt
Bug 975343 - Show multiple phone numbers and iccids on dual sim devices
Merge pull request #17997 from mikehenrty/bug-988737-clear

Bug 988737 - SMS notifications do not clear when launching SMS app after... r=alive
Merge pull request #18162 from mikehenrty/bug-987458-1.4rebase

Merge pull request #18048 from mikehenrty/bug-987458-queuemozapps
Bug 994644 - [master] test_that_device_info_is_populated in failing on CI
Merge pull request #18229 from viorelaioia/bug_994644_v1.4

Bug 994644 - [master] test_that_device_info_is_populated in failing on C...