Merge pull request #8591 from alivedise/bugzilla/849170/lock-orientation-for-attention-screen

Bug 849170 - Lock orientation for attention screen, r=@timdream(cherry picked from commit debb2766b8c658decc51a267eb89ac309c2a828f)
Merge pull request #8525 from lightsofapollo/KevinGrandon-bug_847473_calendar_delay_css

Bug 847473 - Lazy load additional resources r=lightsofapollo(cherry picked from commit df175e5f288debe3bde56b20e59292a634ff3843)
Bug 838042 - [Browser][User Story] Image save from webpage r=benfrancis
(cherry picked from commit 1b1fb4a6637e6cd1254d419057bbe6875d52770c)
Bug 838042 followup to appease the linter r=me
(cherry picked from commit cedc21afea33ba230b75debdb251ea4b5931ac96)
Revert "Bug 847830 - Changed CUSTOMIZE environment variable to GAIA_DISTRIBUTION_DIR"

This reverts commit d2053309deff240513e630c13de1c996ea1c715e.
Bug 832706 - Support more granular time allowances in phone lock r=kaze
(cherry picked from commit 0ccdcb957c6cbcfeea453cfab0898e9988111c62)
Merge pull request #8632 from dhylands/bug-847830-backout-v1-train

Revert "Bug 847830 - Changed CUSTOMIZE environment variable to GAIA_DIST...
Bug 837558 - Delay STK command until FTU is done
Merge pull request #8636 from alivedise/bugzilla/837558_v1-train

Bug 837558 - Delay STK command until FTU is done, r=timdream, a=blocking-b2g:tef+
Merge pull request #8536 from crdlc/bug-849160

Bug 849160 - Add a new contact from call log has the update button disab...(cherry picked from commit 397c1e61ee40918da1a71040a002747e1410a962)

Conflicts:

	apps/communications/contacts/js/contacts.js
Bug 843602 - Refactor OAuth Flow 2.0 components to enable other services...
Merge pull request #8302 from jmcanterafonseca/live_import_next

Bug 843507 - Design and implement a connector to Hotmail service for ret...(cherry picked from commit 5dfa35594238dec2ff87e5aca6362404b6eaa565)
Bug 843505 - Define a generic component for importing contacts from different sources
Bug 845763 - [Contacts] Define a connector to import contacts from Gmail
Bug 844100 - Add linter test to Travis-CI
Bug 844100 - follow up, exclude external shared/js/ files from lint
Bug 844100 - follow up, lint fix to all scripts
Merge pull request #8646 from timdream/v1-train-bug844100

Bug 844100 - Add linter test to Travis-CI & lint fixes, r=dale, a=vingtetun
Merge pull request #8437 from lodr/bug-835928-cc-settings

Bug 835928 - Fixing height, border gaps, alignement, plantype selector and dates
Cause r+(cherry picked from commit a9c63e3b984b527be15b98dd25b54ffe9c6ac4fc)

Conflicts:
	apps/costcontrol/style/views/telephony.css
Merge pull request #8197 from KevinGrandon/bug_836365_dialer_performance

Bug 836365 - Dialer load performance improvements. r=etienne(cherry picked from commit d961f0f1fdf5b769f662aa04728f1cf8cb5653a8)

Conflicts:
	apps/communications/dialer/js/dialer.js
	apps/communications/dialer/js/handled_call.js
	apps/communications/dialer/js/keypad.js
	apps/communications/dialer/js/recents.js
	apps/communications/dialer/js/telephony_helper.js