trying fixing the build after GEOS-5847 broke it
Merge branch 'master' of git://github.com/geoserver/geoserver