am dbe60357: Merge "Use correct pid when running under test harness" into jb-mr2-dev

* commit 'dbe60357db3be0fd6268ce777647733c3383aa72':
  Use correct pid when running under test harness