Merge "Remove _project_network_cidr in security group tests"