Merge "rdbms: cleanup DatabaseSqlite::lock() error handling"