Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  ElasticContainer: Use 6.5.2 for V6_5 tests
  Upgrade elasticsearch-rest-client to 6.5.2

Change-Id: I5e4b027b73e8dc4da0b99d2eb200635d482f3a2d
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 14fe4de..19ea44b 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -45,7 +45,7 @@
       case V6_4:
         return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3";
       case V6_5:
-        return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.1";
+        return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.2";
       case V7_0:
         return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0-alpha1";
     }