Merge "Replace several uses of wfWikiId() with WikiMap methods"