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

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

diff --cc services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
index 4469f7a7af0829757cf803da3d566adde01c0ccb,e218427dd7528db5b9a0cb8cda61040197ed382d..1d739f4eb14a8c55866bd601faf55499ecf5b082
--- 1/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
--- 2/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/config/TenantBindingConfigReaderImpl.java
@@@ -472,28 -470,6 +472,28 @@@ public class TenantBindingConfigReaderI
      }
  
      public String getResourcesDir(){
-         return getConfigRootDir() + File.separator + "resources";
+         return getConfigRootDir() + File.separator + RESOURCES_DIR_NAME;
      }
 +    
 +    
 +    /**
 +     * Returns a list of tenant identifiers (tenant IDs).
 +     * 
 +     * @return a list of tenant IDs
 +     */
 +    public List<String> getTenantIds() {
 +        List<String> tenantIds = new ArrayList<String>();
 +        String tenantId;
 +        Hashtable<String, TenantBindingType> tenantBindings = getTenantBindings();
 +        if (tenantBindings != null && !tenantBindings.isEmpty()) {
 +            Enumeration keys = tenantBindings.keys();
 +            while (keys.hasMoreElements()) {
 +                tenantId = (String) keys.nextElement();
 +                if (Tools.notBlank(tenantId)) {
 +                    tenantIds.add(tenantId);
 +                }
 +            }
 +        }
 +        return tenantIds;
 +    }
  }