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 #114 from collectionspace/CSPACE-6216

CSPACE-6216: Fix lifesci person config to generate extension doctype.