Merge "Fix mcp11-ovs-dpdk and mcp11-ovs-dvr virtual labs"