Regularise handling of "+" in file URLs to fix Jenkins build on Windows
Merge branch 'master' of git://github.com/geoserver/geoserver