Fix ResourcePoolTest failure in path with spaces [GEOS-6551]
Fix GeoServerPersisterTest failure in path with spaces [GEOS-6551]
Fix support for dynamic symbolizer CQL templates [GEOS-6551]
Merge branch 'master' of git://github.com/geoserver/geoserver