Fix GeoServerPersisterTest and the build
Merge pull request #628 from bencaradocdavies/fix-GeoServerPersisterTest

Fix GeoServerPersisterTest and the build
Merge branch 'master' of git://github.com/geoserver/geoserver