Merge "Avoid use of deprecated wikiId field in JobQueue"