Merge "Revert "Move wfEscapeWikiText() to Parser::escapeWikitext()""