Merge "Add barbican_integration_enabled"