Cumulative Fix for GEOS-5698 and GEOS-5215, security GUI bugs
Merge branch 'master' of git://github.com/geoserver/geoserver