fixed smtp err when XOAUTH2 and PLAIN both supported
Merge branch 'fix_smtp'