Fixing some issues reported by Mark Jansen during a pull request review
Merge branch 'master' of git://github.com/geoserver/geoserver