Bug 859035 - [l10n] Do not use the same unknown entity for Size & Author when installing a WebApp
Bug 902409 - Added a missing dependency to the webapp-zip target
Bug 901383 - Some permissions dialogs should have a 'more info' capability. r=etienne

(cherry picked from commit 0b1404818d1d1069ff79320c5fce7708be0b2f20)
902973 - [SMS][MMS] Intermittent TEST-UNEXPECTED-FAIL in notification_test.js r=gnarf

https://bugzilla.mozilla.org/show_bug.cgi?id=902973

- Clean up
- Migrate to sinon.spy
- Use mocks as spy targets
- Assert on spy intel instead of mock properties
- Simpify mocks
- Ensure Threads tests start with hash = '';
- Remove from blacklist

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit 2becb16639589225f5948ebfd1c704cc36cdba0a)

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
Bug 838634 - Better integration of e.me to the landing page. r=pike, a=leo+
Merge pull request #11400 from gabrielesvelto/bug-902409-parallel-builds-v1-train

Bug 902409 - Added a missing dependency to the webapp-zip target r=ochameau
Bug 901041 - Remove 'swipe left' screen in tutorial (as part of the first run experience)

Conflicts:
	apps/communications/ftu/css/images/tutorial/2@1.5x.png
	apps/communications/ftu/css/images/tutorial/2@2x.png
	apps/communications/ftu/css/images/tutorial/3@1.5x.png
	apps/communications/ftu/css/images/tutorial/3@2x.png
	apps/communications/ftu/css/images/tutorial/4@1.5x.png
	apps/communications/ftu/css/images/tutorial/4@2x.png
[Bug 903043] Fix and enhance e.me integration on the landing page
Bug 902465 - Too many CanvasLayer on e.me results hurts panning. part 1. r=vingtetun
Bug 902465 - Too many CanvasLayer on e.me results hurts panning. part2 r=ran
Bug 902465 - Too many CanvasLayer on e.me results hurt panning. r=ran
Bug 900989 - The height of homescreen pages force excessive repaints. r=ran
Bug 902897 - Prevent e.me to be scrolled while panning between pages. r=ran
Bug 902517 - The e.me banner is shown above the dock when a bookmark is added. r=vingtetun
Bug 902973 - REAPPLY Disable sms notification_test.js for frequent TBPL orange, a=test-only

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
(cherry picked from commit e300467f475fa6139fb4e5644b14386bec02a521)
Bug 903400 - Trim whitespaces for search in the e.me search bar. r=vingtetun,a=leo+
Bug 903443 - Fix overlapping tips on first time Evme usage. r=vingtetun,a=leo+
Merge pull request #11341 from fabi1cazenave/systemMissingEntities-bug901449

Bug 901449 - [STK] missing l10n entities, r=timdream(cherry picked from commit cfe8c521c2ba67986c0347cbb07c8ad8ec31af2c)
Merge pull request #11467 from fabi1cazenave/uplift-bug901449

Uplift bug901449
Bug 858463 - Hide the subtitle 'Accounts' if there is no account in settings
(cherry picked from commit c542dd13ed8cfa07e98b21961fcad36f98d57a07)

Conflicts:

	apps/calendar/index.html
	apps/calendar/js/views/advanced_settings.js