Bug 984274 - add required permission for mochitest. r=fabrice
Bug 1029766 - Intermittent TEST-UNEXPECTED-FAIL | collection_test.js | Vertical - Collection drag icon (/w entry point) into collection r=crdlc
Bug 1033318. Show a country list, with a prefix hint
Bug 996863 - [master] show warn message when emergencyOnly. r=Etienne.
Bug 1028398: FxA will silently provide user's email to privileged apps in 2.0. r=zac,arthurcc,gpg
Bug 1036474 - Update test_clock_create_new_alarm to change the alarm time
Merge pull request #21619 from willyaranda/bug1033318

Bug 1033318. Show a country list, with a prefix hint. r=ferjm
Merge pull request #21545 from bebef1987/alarm

Bug 1036474 - Update test_clock_create_new_alarm to change the alarm tim...
Merge pull request #21563 from KevinGrandon/bug_1029766_collection_intermittent_test

Bug 1029766 - Intermittent TEST-UNEXPECTED-FAIL | collection_test.js | Vertical - Collection drag icon (/w entry point) into collection
Merge pull request #21268 from ferjm/bug1028398.fxapermission

Bug 1028398: FxA will silently provide user's email to privileged apps i...
Bug 1017247 - [System] Remove on-homescreen class r=etienne
Merge pull request #21198 from KevinGrandon/bug_1017247_system_launch_regression

Bug 1017247 - [System] Remove on-homescreen class
Merge pull request #21566 from schien/bug984274-fix-mochitest-permission

Bug 984274 - add required permission for mochitest. r=fabrice
Revert "Bug 1029766 - Intermittent TEST-UNEXPECTED-FAIL | collection_test.js | Vertical - Collection drag icon (/w entry point) into collection r=crdlc"

This reverts commit 6cb2e93790340d18d771a4c532ecfb968fa38c51.
Bug 1029766 - Intermittent TEST-UNEXPECTED-FAIL | collection_test.js | Vertical - Collection drag icon (/w entry point) into collection r=crdlc
Merge pull request #21495 from weigao123/bug996863-master

Bug 996863 - [master] show warn message when emergencyOnly. r=Etienne.
Bug 1037194 - Disable intermittent gaia-integration | TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/verticalhome/test/marionette/app_hosted_use_cached_icon_test.js | Vertical Home - Hosted app cached icon fetch fallback to default icon