- GEOS-6275 GEOS-6276 Back Port from 2.5.x
Merge pull request #461 from geoserver/24x_GEOS-6275-6276

 - GEOS-6275 GEOS-6276 Back Port from 2.5.x