Merge "A few more DBLockManager fixes and cleanups"