Merge pull request #2046 from rubenk/cleanup-dpdk-detection