Merge "filebackend: Fix DBLockManager IDEA warnings"