Merge branch '6.4' into 7.2

* 6.4:
  fix path to Panther web server router file

Author: javiereguiluz

testing/end_to_end.rst

@@ -878,7 +878,7 @@ Then declare it as a router for Panther server in ``phpunit.xml.dist`` using the
         <!-- ... -->
         <php>
             <!-- ... -->
-            <server name="PANTHER_WEB_SERVER_ROUTER" value="./tests/router.php"/>
+            <server name="PANTHER_WEB_SERVER_ROUTER" value="../tests/router.php"/>
         </php>
     </phpunit>