Merge "Replace wfWiki() usage with WikiMap in some additional places"