Merge "Consolidate barbican_integration_enabled settings"