Merge "Updates ControlPlaneSubnetCidr to be a string"