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

Conflicts:
	services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java

diff --cc services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
index 7d19d76d5c673ec7787c71416e8f10ce0e2915ff,fcee903af552707dda5f8850e9c5507fb84fd880..5ee13d4fe51359d550bf6f34a1e59fa730f31977
--- 1/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
--- 2/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
@@@ -80,16 -80,7 +80,14 @@@ import javax.ws.rs.core.Response
  import javax.ws.rs.core.UriBuilder;
  import javax.ws.rs.core.UriInfo;
  
- import java.util.ArrayList;
 +import java.util.HashMap;
  import java.util.List;
- import org.collectionspace.services.client.*;
 +import java.util.Map;
 +import org.collectionspace.services.common.*;
 +
 +import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl;
 +import org.collectionspace.services.config.service.ServiceBindingType;
 +
  import org.collectionspace.services.nuxeo.util.NuxeoUtils;
  
  /**

diff --cc services/common/src/main/java/org/collectionspace/services/common/ResourceBase.java
Simple merge