Merge "[MCR] Introduce SlotRoleHandler and SlotRoleRegistry"

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc includes/Revision/RenderedRevision.php
Simple merge

diff --cc includes/Revision/RevisionRenderer.php
Simple merge

diff --cc includes/Revision/RevisionStore.php
Simple merge

diff --cc includes/Storage/DerivedPageDataUpdater.php
Simple merge

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

diff --cc languages/i18n/en.json
Simple merge

diff --cc languages/i18n/qqq.json
Simple merge

diff --cc tests/phpunit/includes/Revision/RevisionRendererTest.php
Simple merge

diff --cc tests/phpunit/includes/Revision/RevisionStoreDbTestBase.php
Simple merge

diff --cc tests/phpunit/includes/RevisionDbTestBase.php
Simple merge

diff --cc tests/phpunit/includes/RevisionTest.php
Simple merge

diff --cc tests/phpunit/includes/Storage/DerivedPageDataUpdaterTest.php
Simple merge

diff --cc tests/phpunit/includes/page/WikiPageDbTestBase.php
Simple merge