Merge branch '5.4' into 6.4

* 5.4:
  Revert bumping contract version
  stop all server processes after tests have run

HttpClient/Test/HttpClientTestCase.php

@@ -28,6 +28,12 @@ abstract class HttpClientTestCase extends TestCase
         TestHttpServer::start();
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        TestHttpServer::stop(8067);
+        TestHttpServer::stop(8077);
+    }
+
     abstract protected function getHttpClient(string $testCase): HttpClientInterface;
 
     public function testGetRequest()

HttpClient/Test/TestHttpServer.php

@@ -45,4 +45,11 @@ class TestHttpServer
 
         return $process;
     }
+
+    public static function stop(int $port = 8057)
+    {
+        if (isset(self::$process[$port])) {
+            self::$process[$port]->stop();
+        }
+    }
 }