GEOS-5844 2.3.x

This commit did apply cleanly to master but the test fails due to a change in SecureCatalog that currently requires the GeoServerSecurityManager to be loaded. Not sure what the best approach to dealing w/ this is.