Merge "Fix DBLockManager comments"