Merge "Avoid deprecated IDatabase::getWikiId() reference"