Merge "Ensure subnet for port security group tests"