Work around importer test to get the windows build going
Merge branch 'master' of git://github.com/geoserver/geoserver