Merge branch '3.8' into create-pull-request/3.8.1-SNAPSHOT

Author: reta

src/testFixtures/java/org/opensearch/knn/ODFERestTestCase.java

@@ -57,6 +57,11 @@ protected String getProtocol() {
         return isHttps() ? "https" : "http";
     }
 
+    @Override
+    protected Settings restClientSettings() {
+        return Settings.builder().put(super.restClientSettings()).put(CLIENT_SOCKET_TIMEOUT, "90s").build();
+    }
+
     @Override
     protected RestClient buildClient(Settings settings, HttpHost[] hosts) throws IOException {
         RestClientBuilder builder = RestClient.builder(hosts);