Fix GEOS-5796 test
Merge branch 'master' of git://github.com/geoserver/geoserver