Updating geoserver submodule, applying advertised filter hack and changing to trim branch