Bug 915468 - Localize app name in gaia for permission
Bug 847032 - [email] IMAP only supports initially-SSL encrypted connections, STARTTLS upgrade not supported from unencrypted cleartext.
Bug 905606 - Gaia for bug 892212 Support for BT inline pairing User r=evelyn
Bug 887680 - [User Story] Create a conf call with upto 5 participants
Merge pull request #12217 from Rik/merge-button-887680-clean

Bug 887680 - [User Story] Create a conf call with upto 5 participants r=etienne
Update gaia-ui-tests.json; Merge pull request #1343 from bebef1987/key

Mirgate e.me search tests to use the onscreen keyboard
Revert "Merge pull request #12190 from alivedise/bugzilla/912796/lockscreen-meets-attentionscreen"

This reverts commit 669b4b40972ae008b26270557a393383ae094a2b, reversing
changes made to 6daadc0648db36252fea687f1ceba1de6ad9428d.

This breaks the unit tests.
Merge pull request #12181 from alivedise/bugzilla/915468/localize-app-name-in-gaia-permission

Bug 915468 - Localize app name in gaia for permission
Bug 912796 - Back to main screen when attention screen is shown
Merge pull request #12219 from alivedise/bugzilla/912796_v2

Bug 912796 - Back to main screen when attention screen is shown
Update gaia-ui-tests.json; Merge pull request #1367 from davehunt/bug916072

Bug 916072 - Update cleanup to reflect change of persistent storage path
Revert "Merge pull request #12212 from gaye/bumpt-marionette-client"

This reverts commit a4255258e5ee8123602f4d307c9057ae327c2190, reversing
changes made to 3218122421bdab8c1b5b631ad789fd035d5a81eb.

I'm backing this on speculation that this is making everything time out
Merge pull request #12216 from asutherland/starttls

Bug 847032 - [email] IMAP only supports initially-SSL encrypted connections, STARTTLS upgrade not supported from unencrypted cleartext. r=asuth
lock gaia version
Merge pull request #12221 from lightsofapollo/marionette-fix-state

lock gaia version
Bug 916081 - Fix UITest Notification Test Bind