Merge "Rebase: adapt patches after ovs/dpdk fix"