CSPACE-6130: Always emit non-preferred terms in authority item list results in a standard way, ignoring any instances where the termDisplayName field may be configured as a ListResultsField in services/tenant bindings.
CSPACE-6142: Update ant undeploy target for the person/3rdparty/nuxeo-platform-person-lifesci module, now that the persons_naturalhistory schema has been revived in the Services per work on CSPACE-6152.
Merge remote-tracking branch 'upstream/master' into CSPACE-6130
CSPACE-6130: Handle instances where the termDisplayName is declared multiple times in App layer configuration. Improve comment.
CSPACE-6130: Add more comments outlining how preferred and non-preferred terms are emitted in authority item list results.
CSPACE-6130: Remove stray semi-colon (empty statement).
CSPACE-6152,CSPACE-6158: Remove redundant declaration of persons_naturalhistory part in Lifesci tenant bindings delta file; this part is already declared in App layer config for the Person record. Having this present in the delta file resulted in duplicate entries for this part in the merged tenant bindings.
Merge remote-tracking branch 'upstream/master' into CSPACE-6130
Merge pull request #126 from aronr/CSPACE-6130

CSPACE-6130: Always emit non-preferred terms in authority item list resu...
CSPACE-6157: Fix FileNotFoundException in finding log4j logfile when generating service doctype and schema artifacts.
CSPACE-6157: Passing value from more generic environment variable to App layer tool for generating Services artifacts.
CSPACE-6157: Revert part of last commit to reflect current variable naming in App layer log4j properties file, other App layer server location properties. (Need to standardize on JEE_SERVER_HOME at some future point.)
CSPACE-6166: Remove redundant deltas.
CSPACE-6717: Event listener that updates computed current location in Cataloging records now filters out past versions of documents.
CSPACE-6171: Add Lifesci test of updating computed current location in Cataloging to XmlReplay master.
Merge pull request #128 from aronr/CSPACE-6171

CSPACE-6171: Update computed current location for objects even when record versioning is enabled.
CSPACE-5615,CSPACE-6139: Add comments to 'old-style' tenant bindings delta files in the Services layer, identifying that these are for use with CollectionSpace versions 3.3 and earlier.
CSPACE-6178: Clean up all new-style (unified config) schema JAR files from /usr/local/share/apache-tomcat-6.0.33/nuxeo-server/plugins, not just schema JAR files for common schemas and any out-of-the-box extension schemas.
CSPACE-6178: Removing two additional Ant directives missed during first pass.
Merge pull request #129 from aronr/CSPACE-6178

CSPACE-6178: Remove schema JARs for extension schemas as well as common on 'ant undeploy'.