Merge "Add isCurrentWikiId()/isCurrentWikiDomain()/getCurrentWikiDomain() to WikiMap"

diff --cc includes/MediaWiki.php
Simple merge

diff --cc includes/jobqueue/JobQueueGroup.php
Simple merge

diff --cc includes/mail/UserMailer.php
Simple merge

diff --cc includes/page/WikiPage.php
Simple merge

diff --cc includes/skins/Skin.php
Simple merge

diff --cc includes/specials/SpecialUserrights.php
Simple merge

diff --cc includes/user/User.php
Simple merge