Merge branch 'cspace-4813' of github.com:collectionspace/services into cspace-4813

Conflicts:
	services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java

diff --cc services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
index 990782cc421103db2fb80160b20728e24cfc9376,024eab8bc9d3420fe67f9f38d36909fcbadb4971..6c01bb5e7490a54a9a16cf9386b3777cac4eeaf4
--- 1/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
--- 2/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
+++ b/services/authority/jaxb/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityItemJAXBSchema.java
@@@ -36,11 -36,8 +36,8 @@@ public interface AuthorityItemJAXBSchem
          final static String TERM_DISPLAY_NAME = "termDisplayName";\r
          final static String TERM_NAME = "termName";\r
          final static String TERM_STATUS = "termStatus";\r
-         final static String PREFERRED_TERM_DISPLAY_NAME_XPATH ="termGroupList/0/termDisplayName";\r
-         final static String PREFERRED_TERM_NAME_XPATH ="termGroupList/0/termName";\r
-         final static String PREFERRED_TERM_STATUS_XPATH ="termGroupList/0/termStatus";\r
 -        // CSPACE-4813\r
 -        /*\r
 +        final static String TERM_INFO_GROUP_SCHEMA_NAME = ""; //FIXME: REM - Needs to be defined.\r
 +        // CSPACE-4813 - Remove all the below values and recompile all authorityitem related classes\r
        final static String DISPLAY_NAME = "displayName";\r
        final static String DISPLAY_NAME_COMPUTED = "displayNameComputed";\r
        final static String SHORT_DISPLAY_NAME = "shortDisplayName";\r