Merge "Migrate various callers away from wfWikiId() to WikiMap"