Merge pull request #5634 from ctomc/testsuite-fix

Fix few more intermittent testsuite issues
Upgrade to JavaMail 1.5.1