NOJIRA: Change settings in App layer's nightly settings file for core tenant to match those of settings.xml.
CSPACE-5684: Following Rick's lead, update values in App layer 'services-tenant-singular' tags to actual service doctype values. (These will change again with Unified Configuration, but are needed in the interim to make two-directional pivoting work in the aftermath of CSPACE-6006 work on integrating the Citation Authority.)
Merge pull request #81 from aronr/CSPACE-5684

CSPACE-5684: Following Rick's lead, update values in App layer 'services...
Merge remote-tracking branch 'upstream/master' into CSPACE-6008