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