Merge "Split DBLockManager classes into their own files"