CSPACE-6323: Update app layer test files to reflect config changes.
Merge branch 'ucb-deploy_4.0' into pahma_4.0