Bug 1030687 - Bump gaiatest-v1.3 version to 0.2. r=zcampbell
Merge pull request #20525 from asutherland/email-as-dev-id

Bug 825538 - [email/activesync] Need to allocate unique device ID's for multi-device access to ActiveSync. r=squib
Merge pull request #21003 from jimporter/email-as-download-body-failure

Bug 1009422 - [email/Activesync/hotmail] Apparent change in server behav...
Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after failed cronsync(s) r=mcav
Conflicts:
	apps/email/js/cards/compose.js
Revert "Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe"

This reverts commit e5f7bbd6b8ee0b0014d2fef73a4ef59b620acaed.
Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s)

From master commit e64d7adf507d0f0164988257d30600499b1e5776
Merge pull request #21070 from jrburke/bug1025727-v1.3-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s) r=mcav a=bajaj
Bug 1015833 - [PTCRB][STK]27.22.4.1.1/2 DISPLAY TEXT, normal priority, Unpacked 8 bit data for Text String, screen busy case failed, r=vingtetun

Conflicts:
	apps/system/js/icc_worker.js
Merge pull request #21113 from frsela/STK/Bug1015833_v1.3

Bug 1015833 - [PTCRB][STK]27.22.4.1.1/2 DISPLAY TEXT, normal priority, Unpacked 8 bit data for Text String, screen busy case failed
Bug 1026377 - [Sora]There is no highlight stripe when selecting some option in STK menu