BAMPFA-326: Move this feature into shared UCB branch, so it's available to all deployments.
Merge branch 'cspace-deployment_4.0' into bampfa_4.0
BAMPFA-326: Remove some tenant overrides, since the changes are now in defaults.