Merge "Avoid uses of wfWikiId() in maintenance/"