Timeout implementation on LockManager and corresponding test case
Formatting changes