Merge remote-tracking branch 'upstream/master' into CSPACE-5271

Merge remote-tracking branch 'upstream/master' into CSPACE-5271

Conflicts:
	services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
	services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
	services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityItemDocumentModelHandler.java
	services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
	services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
	services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java