Merge "DPDK package fixes"