Merge branch 'stable-3.1'

* stable-3.1:
  Use Gerrit 3.1.4 in Dockerfile
  Use Gerrit 3.0.8 in Dockerfile
  Use Gerrit 2.16.17 in Dockerfile
  Dockerfile: Add delete-project plugin to instances
  e2e-tests: Adapt json filename constant to new name
  e2e-tests: Introduce a CloneUsingHAGerrit2 scenario

Change-Id: Iac57c7cf65e08c227fc05797f7f5f14fb2b8359a
diff --git a/src/test/docker/gerrit/Dockerfile b/src/test/docker/gerrit/Dockerfile
index 426826f..f60212b 100644
--- a/src/test/docker/gerrit/Dockerfile
+++ b/src/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@
-FROM gerritcodereview/gerrit:3.1.3
+FROM gerritcodereview/gerrit:3.1.4
 
 ENV GERRIT_BRANCH=stable-3.1