testing: be more specific when sanitizing tcpdump pid
Merge branch 'master' into github_master