Miscellaneous fixes (eg CO-620 followup)
Additional cleanup following acbf669
Miscellaneous fixes (CO-620 followup)
Additional fix for CO-620
Another fix for CO-620
Merge branch 'develop' of github.com:Internet2/comanage-registry into develop