Merge "Fix ICMP code/type in security group rule test"