Partially applying pull request #1 - keeping license information as other ASF projects do
Upgrading GreenMail to 1.4.0
Merge from 1_1_X
Merge branch '1_2_X'