Merge "Introduce a BlockManager service"

diff --cc RELEASE-NOTES-1.34
Simple merge

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

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