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 966865 - Update pdf.js to version 0.8.997.
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 942460 - [Contacts] Implement position:sticky for fixed headers r=bkelly
Bug_922609_Provide a way for tests to determine that the video app has finished scanning
Bug 968382 - software home button doesn't work when rocketbar is active r=alive
Bug 933542 - Added special characters to Slovak keyboard
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 960473 : Fix ReadNdef Issue when using Connect()
[B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image
[B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image
Bug 964927 [B2G][Contacts] Changing phone orientation while on crop screen when adding a new contact picture distorts image - merge
Bug 942199: Allow minimum EXIF preview size to be configured at build time for Camera and Gallery
(cherry picked from commit e439f8630fdea790595efaebab24ec21be6bc0e4)

Conflicts:

	apps/camera/js/filmstrip.js
Bug 968996 - Bump gaiatest to 0.21.5, r=zac
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