KNOX-366 fixed stale pid detection again
Merge remote-tracking branch 'origin/apache-ref/master' into champlain