Merge branch 'stable-3.4'

* stable-3.4:
  Test cache invalidation behaviour inside a Gerrit daemon

Change-Id: I7a65b8aace0beb977f1c8f3121c6f59362867097

src/test/docker/gerrit/Dockerfile

diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile
index 6834f57..820be4c 100644
--- a/src/test/docker/gerrit/Dockerfile
+++ b/src/test/docker/gerrit/Dockerfile
@@ -1,6 +1,6 @@
-FROM gerritcodereview/gerrit:3.4.1
+FROM gerritcodereview/gerrit:3.5.0-rc2
 
-ENV GERRIT_BRANCH=stable-3.4
+ENV GERRIT_BRANCH=stable-3.5
 
 ENV GERRIT_CI_URL=https://gerrit-ci.gerritforge.com/job
 
@@ -11,7 +11,7 @@
 USER gerrit
 
 ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-javamelody-bazel-master-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/javamelody/javamelody.jar /var/gerrit/plugins/javamelody.jar
-ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-high-availability-bazel-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/high-availability/high-availability.jar /var/gerrit/plugins/high-availability.jar
+ADD --chown=gerrit:gerrit $GERRIT_CI_URL/plugin-high-availability-bazel-master-$GERRIT_BRANCH/lastSuccessfulBuild/artifact/bazel-bin/plugins/high-availability/high-availability.jar /var/gerrit/plugins/high-availability.jar
 
 USER root