Merge "Rename references to compute security groups client"