am af69cf8d: Fix several issues with the lock sampling code.  This change obsoletes the lockProfSample flag.

Merge commit 'af69cf8d062a42300852ddee6bcb9f189f5a1b83' into kraken

* commit 'af69cf8d062a42300852ddee6bcb9f189f5a1b83':
  Fix several issues with the lock sampling code.  This change obsoletes