Updated upstream geoserver dependencies to include gs-prefix.

Also including some upstream module name changes.