Merge "[LockManager] Updated DBLockManager for cross-wiki support."