Merge "Fix test_multicast_between_vms_on_same_network"