grab fixes from geoserver-exts