Merge "Rename the CldsSecurityConfig"