shrine

Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1736


 Conflicts:

	docker/scripts/src/main/docker/dev-environments/shrine-hub/network-setup/override.conf

	hub/data-store/src/test/resources/shrine.conf

	hub/message-service/src/main/scala/net/shrine/messagequeuemiddleware/MessageTranslationHandler.scala