Merge "MediaWiki.php: Factor out tryNormaliseRedirect"