Merge pull request #16518 from greenpeace-cee/fix-xoauth-imap