Merge "enable vhostuser for ovs-dpdk scenario"