Merge pull request #2157 from maryamtahhan/dpdkevents_upstream