Bug 965486 - [Camera] Build time configuration system

It allows to specify an external js/config/app.js file.
The file is copied over the original one in the repo
Bug 983070 - [Message][UI Test] The received message should not causes message thread to open in the thread list view.

uplift from master
Bug 997064: Do not call navigator.mozFMRadio from system app.
Merge pull request #18580 from etiennesegonzac/bug-997701-tone-player-channel

Bug 997701 - Set TonePlayer's channel when creating the audi element. r=gsvelto, rik
(cherry picked from commit 3617fa6b6e5e2e3c7a198227d27a12bca830ff0a)
Merge pull request #18815 from chirarobert/v1.4_sms_dialer

Bug 983070 - [Message][UI Test] The received message should not causes m...
Bug 993161 - Ensure the value of 'ril.iccInfo.mbdn' is valid when starting up
Merge pull request #18773 from jrburke/bug1002932-email-stamp-cache-minify

Bug 1002932 - [email] cookie cache no longer working with GAIA_OPTIMIZE=1 r=asuth
Merge pull request #18803 from dmarcos/bug965486v1.4

Bug 965486 - [Camera] Build time configuration system
Merge pull request #18833 from crh0716/993161_v1.4

Bug 993161 - Ensure the value of 'ril.iccInfo.mbdn' is valid when starting up r=jaoo
Bug 999171 - Implement a progress indicator to show progress when the viewfinder has not loaded

Conflicts:
	apps/camera/js/app.js
	apps/camera/js/config/config.js
	apps/camera/js/controllers/controls.js
	apps/camera/test/unit/app_test.js
Merge pull request #18855 from wilsonpage/999171-v1.4

Bug 999171 - Implement a progress indicator to show progress when the
Bug 1000984 - [Camera] Pinch-to-zoom gesture should be attached to the |window| object in the DOM
Merge pull request #18871 from justindarc/bug1000984-v1.4

Bug 1000984 - [Camera] Pinch-to-zoom gesture should be attached to the |...
Bug 1004963 - Update camera tests
Bug 1003746 - Fix the tap_subject() method of email apps
Merge pull request #18886 from chirarobert/v1.4_camera_fix

Bug 1004963 - Update camera tests
Merge pull request #18889 from chirarobert/v1.4_email_uplift

Bug 1003746 - Fix the tap_subject() method of email apps
Bug 998488 - STK PLAY_TONE feature broken r=:etienne

- Access _iccManager from icc instead of iccManager

- Add test case for PLAY_TONE
Merge pull request #18870 from nullaus/bug1004239

bug 1004239 -- Filter out all titles that contain app:// protocol and re...(cherry picked from commit d33e4f1531a687eed3beb4f34668b126b9d4c5fb)
Merge pull request #18953 from nullaus/v1.4

Merge pull request #18870 from nullaus/bug1004239