Merge pull request #2417 from bluca/dpdk_pkgconfig_backport