Merge pull request #107 from aronr/CSPACE-6199

CSPACE-6199: Allow sparse overriding of admin settings in settings.xml.
CSPACE-6204,CSPACE-6207: Integrated Ray's contribution of a separate XmlMerge properties file for the per-tenant settings.xml file, splitting this off from the general XmlMerge properties file. Added a terms-used block to the latter properties file, also a UCB contribution. Added explanatory comments to each of the two properties files.
CSPACE-6024: Clarified comment describing use of XPaths in XmlMerge.
CSPACE-6024: Additional clarification of comments.
Merge pull request #108 from aronr/CSPACE-6204

CSPACE-6204,CSPACE-6207: Split off XmlMerge properties related to settings file. Add terms-used merge rule.
Merge pull request #109 from aronr/CSPACE-6204

CSPACE-6204,CSPACE-6207: Split off XmlMerge properties related to settings file. Add terms-used merge rule.
CSPACE-6206,CSPACE-6205: Replace the <instances> block outright in App layer authority config files. Minor reordering of demonstration vocabulary instances to uniformly place local instances first.
CSPACE-6206,CSPACE-6205: Whitespace fixes.
CSPACE-6206,CSPACE-6205: Update App layer test datafile to reflect reordering of vocabularies.
Merge pull request #110 from aronr/CSPACE-6206

CSPACE-6206: Replace the <instances> block outright in App layer authority ...
Merge pull request #111 from aronr/CSPACE-6206

CSPACE-6206: Replace the <instances> block outright in App layer authority ...
CSPACE-6213: In Work authority, make the termSource field an autocomplete field tied to the Citation authority, as in other authority records.
Merge pull request #112 from aronr/CSPACE-6213

CSPACE-6213: In Work authority, make the termSource field an autocomplete...
Merge pull request #113 from aronr/CSPACE-6213

CSPACE-6213: In Work authority, make the termSource field an autocomplet...
CSPACE-6216: Add 'is-extension=true' attribute to lifesci-authority-person.xml.
Merge pull request #115 from collectionspace/CSPACE-6216

CSPACE-6216: Fix lifesci person config to generate extension doctype.
Merge pull request #114 from collectionspace/CSPACE-6216

CSPACE-6216: Fix lifesci person config to generate extension doctype.
CSPACE-6221: In the App layer's verification that data is retrievable from the Services layer, prior to sending password reset email, exclude records that aren't 'real' (e.g. have a 'separate-record=false' attribute in their record configuration).
Merge pull request #116 from aronr/CSPACE-6221

CSPACE-6221: Fix App layer check performed prior to sending password reset email.
Merge pull request #117 from aronr/CSPACE-6221

CSPACE-6221: In the App layer's verification that data is retrievable fr...