Fix to the process check
Merge branch 'master' of github.com:DataDog/dd-agent
Fix conflict