Bug 847032 - [email] IMAP only supports initially-SSL encrypted connections, STARTTLS upgrade not supported from unencrypted cleartext.
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 910713 - Global key isnt hidden if there is only one layout