CSPACE-5845: Applied standard code formatting to TemplateExpander, prior to work that may potentially revise this file in CSPACE-5845 and other work on Imports service.
Merge remote-tracking branch 'upstream/master' into CSPACE-5845

Conflicts:
	services/imports/service/src/main/java/org/collectionspace/services/imports/TemplateExpander.java