Bug 1014400 - [Test Agent] Specify mocha options without patching test-agent itself
Bug 1022053 - Fix capitalisation of OK. r=me
Merge pull request #20339 from RickyChien/bug-1014400

Bug 1014400 - [Test Agent] Specify mocha options without patching test-agent itself r=@julienw
Bug 1014400 - Follow-up, update gaia_node_modules.revision
Merge pull request #20521 from RickyChien/bug-1014400-follow-up

Bug 1014400 - Follow-up, update gaia_node_modules.revision r=me
Bug 825538 - [email/activesync] Need to allocate unique device ID's for multi-device access to ActiveSync. r=squib

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/313
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
Bug 1025499 - [Search] Intermittent failure, Vertical - Search Search for app r=daleharvey
Revert "Bug 1022971 - Rename Icon grid object to Mozapp r=lightsofapollo"

This reverts commit 78ec7950484ab07867d97dd565df1f0424fa05da.
Bug 1022971 - Rename Icon grid object to Mozapp r=lightsofapollo
Merge pull request #20526 from KevinGrandon/bug_1025499_search_intermittent

Bug 1025499 - [Search] Intermittent failure, Vertical - Search Search for app
Bug 1024863 - Safeguard against potential race condition r=lightsofapollo