Bug 901512 - [Contacts] Unable to finish the linking process when there has been an error while retrieving the picture of FB contact
Bug 847032 - [email] IMAP only supports initially-SSL encrypted connections, STARTTLS upgrade not supported from unencrypted cleartext. r=asuth a=blocking-b2g=leo+
Conflicts:
	apps/email/js/cards/setup_manual_config.html
	apps/email/js/cards/setup_manual_config.js
	apps/email/js/mail-common.js
	apps/email/style/setup-cards.css
Merge pull request #12229 from asutherland/email-starttls-v1-train

Bug 847032 - [email] IMAP only supports initially-SSL encrypted connections, STARTTLS upgrade not supported from unencrypted cleartext. r=asuth a=blocking-b2g=leo+
Bug 916023 - Add Gaia functional tests. r=jgriffin
Bug 917374 - add __init__.py to tests/python/gaia-ui-tests/gaiatest/apps/bango/