Merge "Adds enic workaround for OVS DPDK"