Merge "Fix bug 3112733 - Missing TLS encryption option in manual email account setup" into honeycomb