Merge "Fix RPM_DPDK linting"