Merge "Pass the user and request into BlockManager::getUserBlock"

diff --cc includes/ServiceWiring.php
Simple merge

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

diff --cc tests/phpunit/includes/user/UserTest.php
Simple merge