Remove default cardinality MANDATORY_UNARY
Join all @References on a single line for better grep support
Fix CloudProviderBridge