GEOS-5819 - partial fix for LDAPAuthenticationProviderTest failures
Merge branch 'master' of git://github.com/geoserver/geoserver