UCBG-221: Added action.instances=REPLACE
Merge branch 'ucb-deploy_2.4' into ucjeps_2.4
UCJEPS-365: Clean up of 2.4 configuration overlays.