[GEOS-5681] Relative path to watermark file does not work as advertised
Merge branch 'master' of git://github.com/geoserver/geoserver