Conflicts: tests/PHPUnit/Integration/BlobReportLimitingTest.php tests/PHPUnit/IntegrationTestCase.php tests/PHPUnit/UI
