Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  e2e-tests: Fix regex to adapt to JSON_COMPACT
  Use Gerrit 3.1.15 in Dockerfile

Change-Id: I041678abf09cac33e08f81c7b2fc6e79f4364bed

src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala

diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala
index 6a0d07f..7e63134 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala
@@ -42,7 +42,7 @@
       }
     })
     .exec(http(uniqueName).get("${url}")
-      .check(regex("\"" + memKey + "\": (\\d+)")
+      .check(regex("\"" + memKey + "\":(\\d+)")
         .is(session => session(entriesKey).as[String])))
 
   setUp(

src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala

diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala
index ed19c0b..8a04245 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/GetProjectsCacheEntries.scala
@@ -31,7 +31,7 @@
   val test: ScenarioBuilder = scenario(uniqueName)
     .feed(data)
     .exec(http(uniqueName).get("${url}")
-      .check(regex("\"" + memKey + "\": (\\d+)").saveAs(entriesKey)))
+      .check(regex("\"" + memKey + "\":(\\d+)").saveAs(entriesKey)))
     .exec(session => {
       if (consumer.nonEmpty) {
         consumer.get.entriesBeforeFlush(session(entriesKey).as[Int])