(LockIntermittentFailure) Fix intermittent test failure in locking
Merge pull request #793 from mrvisser/intermittent-locking-failure

(LockIntermittentFailure) Fix intermittent test failure in locking