Further attempt to resolve both .kml and .kmz in GeoServer matching
Merge branch 'resource_format_fix' into noaa_dev_resource_format_test