Updated to accept both cida-geoserver and dsas-geoserver - we've now split up geoservers to have a DSAS geoserver and a Portal geoserver due to issues with geoserver import from itself
Merge pull request #717 from isuftin/master

Creating a secondary geoserver for use with the portal. This requires a bunch of rewrites in the handling code