Merge "Avoid unstubbing $wgUser before the end of Setup.php in User::getBlockedStatus()"