Bug 964188 - [Settings] fix main integration jshint
Bug 948415 - Make mock_contact.py pythonic, make
insert_contact convert it to mozcontact API
friendly format. r=dhunt r=zcampbell
Bug 964342: Send language setting to basket.

* Add error codes to basket client.
* Use error code for invalid email instead of looking for a message.
Bug 968382 - software home button doesn't work when rocketbar is active r=alive
Bug 933365 - [Messages] Consider adding the resend option in the message context menu for errored message
Bug 968794 - Test test_settings_do_not_track fails intermittently on device
Bug 967277 - [Contacts] Scrolling the contacts app causes reflow. Followup. r=arcturus
Bug 964252 - Move FakeUpdateChecker code into a method or class r=zcampbell
Bug 969229 - Incorrect unit tests in test-agent GUI
Merge pull request #16066 from RickyChien/issue-969229

Bug 969229 - Incorrect unit tests in test-agent GUI r=@yurenju
Bug 968669 - Migrate code snippet for calendar customization from applications-data.js to apps/calendar/build/build.js
Bug 968854 - test_ftu_skip_tour.py fails because bug 965912
Bug 967994 - Implement various levels of rocketness r=yurenju
Merge pull request #16038 from KevinGrandon/bug_967994_hybridbar

Bug 967994 - Implement various levels of rocketness
Merge pull request #15757 from gasolin/issue-964188

Bug 964188 - [Settings] fix main integration jshint, r=arthur
Merge pull request #16065 from yurenju/calendar-makefile

Bug 968669 - Migrate code snippet for calendar customization from applications-data.js to apps/calendar/build/build.js, r=timdream
Merge pull request #16041 from kumarrishav/issue-933365

Bug 933365 - [Messages] Consider adding the "resend" option in the message context menu for errored message
r=rwaldron
Merge pull request #16032 from KevinGrandon/bug_968382_software_buttons_level

Bug 968382 - software home button doesn't work when rocketbar is active r=alive
Bug 968703 - Migrate code snippet for wapppush customization from applications-data.js to apps/wappush/build/build.js
Bug 969287 - Keyboard click sound should not be enabled by default r=janjongboom