Merge "rm hardcoded cidr in test_create_server_multi_nic"