I think I committed everything we need into trunk.
r427649 and r429311 should be verified and backported to 2.3
I have a doubt about Javamail/JAF licenses: the http://java.sun.com/products/javamail/ homepage links to glassfish project that reference the CDDL license, but the downloadable artifacts include a different LICENSE file. Currently I have copied the LICENSE files from the downloadable artifact to <name>.LICENSE in the lib folder but I linked the CDDL url in the bottom of our main LICENSE txt file.
Not sure what is the right thing to do. AFAIK Sun made id public that these artifacts are now CDDL but they included the old license in the artifacts...