fixing injectGraphic to fall back on existing properties of graphic, rather than setting to null
Merge branch 'master' of git://github.com/geoserver/geoserver