Merge branch 'PAHMA-963-REM-A' into PAHMA-963-REM-C

diff --cc pom.xml
Simple merge

diff --cc services/common/pom.xml
index 6a6e6e6b8de56a87fe2cc29ae2a1e3153975e902,38b714cb55af86a3db9a2bcd6e77348db74aa5af..9676e2f370761aaeb3ee8ef38c88f052196f327f
--- 1/services/common/pom.xml
--- 2/services/common/pom.xml
+++ b/services/common/pom.xml
@@@ -378,8 -384,38 +384,13 @@@
              <version>${spring.security.version}</version>\r
              <scope>provided</scope>\r
          </dependency>\r
+               <dependency>\r
+                       <groupId>org.springframework</groupId>\r
+                       <artifactId>spring-aop</artifactId>\r
+                       <version>${spring.version}</version>\r
+               </dependency>        \r
      </dependencies>\r
  \r
 -    <repositories>\r
 -        <repository>\r
 -            <snapshots>\r
 -                <enabled>false</enabled>\r
 -            </snapshots>\r
 -            <releases>\r
 -                <enabled>true</enabled>\r
 -            </releases>\r
 -            <id>el4jReleaseRepositoryExternal</id>\r
 -            <name>External release repository of the EL4J project</name>\r
 -            <url>http://public-el4.elca-services.ch/el4j/maven2repository</url>\r
 -        </repository>\r
 -        <repository>\r
 -            <snapshots>\r
 -                <enabled>false</enabled>\r
 -            </snapshots>\r
 -            <releases>\r
 -                <enabled>true</enabled>\r
 -            </releases>\r
 -            <id>Apache</id>\r
 -            <name>External release repository of the Apache projects</name>\r
 -            <url>https://repository.apache.org/content/groups/public/</url>\r
 -        </repository>\r
 -    </repositories>\r
 -\r
      <build>\r
          <finalName>collectionspace-services-common</finalName>\r
        <defaultGoal>install</defaultGoal>\r

diff --cc services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
index ec2d63d845864238280cdc13621472e9e4196585,13f47fe5d15809fff159d4b37d91ecad1d69145c..7699f7520cbaf91246d88983f85c035736927708
--- 1/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
--- 2/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/vocabulary/RefNameServiceUtils.java
@@@ -472,28 -465,10 +472,28 @@@ public class RefNameServiceUtils 
          return nRefsFound;\r
      }\r
  \r
 -    private static DocumentModelList findAuthorityRefDocs(\r
 +    private static DocumentModelList findAllAuthorityRefDocs(\r
 +            ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,\r
 +            RepositoryClient<PoxPayloadIn, PoxPayloadOut> repoClient,\r
 +            RepositoryInstance repoSession, List<String> serviceTypes,\r
 +            String refName,\r
 +            String refPropName,\r
 +            Map<String, ServiceBindingType> queriedServiceBindings,\r
 +            Map<String, List<AuthRefConfigInfo>> authRefFieldsByService,\r
 +            String whereClauseAdditions,\r
 +            String orderByClause,\r
 +            int pageSize,\r
 +            boolean computeTotal) throws DocumentException, DocumentNotFoundException {\r
 +              \r
 +      return new LazyAuthorityRefDocList(ctx, repoClient, repoSession,\r
 +                      serviceTypes, refName, refPropName, queriedServiceBindings, authRefFieldsByService,\r
 +                      whereClauseAdditions, orderByClause, pageSize, computeTotal);\r
 +    }\r
 +    \r
 +    protected static DocumentModelList findAuthorityRefDocs(\r
              ServiceContext<PoxPayloadIn, PoxPayloadOut> ctx,\r
              RepositoryClient<PoxPayloadIn, PoxPayloadOut> repoClient,\r
-             RepositoryInstance repoSession, List<String> serviceTypes,\r
+             RepositoryInstanceInterface repoSession, List<String> serviceTypes,\r
              String refName,\r
              String refPropName,\r
              Map<String, ServiceBindingType> queriedServiceBindings,\r