Merge "filebackend: avoid use of IDatabase::clearFlags() in DBLockManager"