Merge "Add API test for normalized CIDR attribute in the SG rule"