Merge "Adaptations for OVS-DPDK blueprint"