Merge "Fix 'Number of new ports: 2' failure mode on test_hotplug_nic"