Merge "Improve IPV6 parity in Security Group testcases"