CSPACE-6321: Remove extraneous space from org History field.
Merge branch 'ucb-deploy_4.0' into pahma_4.0
NOJIRA: Merge changes from defaults into tenant files.