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