Merge "[LockManager] Cleaned up DBLockManager and reduced code duplication."