Fix javadocs for JDK 1.7
Merge branch 'master' of git://github.com/geoserver/geoserver