Merge "Remove extra Imap authenticator" into jb-ub-mail-ur9