Imports fixed (they break Java 6 build)

git-svn-id: https://svn.apache.org/repos/asf/geronimo/javamail/trunk@1642228 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstreamapa/trunk' into trunk