Merge "objectcache: fix DatabaseSqlite::initSqliteDatabase() call location"