Merge branch '9.5'

Author: sebastianbergmann

tests/end-to-end/no-log-cc-override/_files/phpunit.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="../../../../phpunit.xsd"
+         bootstrap="NoLogNoCc.php"
          verbose="false"
          colors="false"
          cacheResult="false">