Upgrade dor-services and mods
Merge branch 'master' of github.com:sul-dlss/geohydra