Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Fix properties in EventConsumerIT tests

Change-Id: Ie4a063cadc2e2da7f7eb5b0759205a8fde2c6829
diff --git a/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java b/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java
index 4e27585..118a868 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java
@@ -131,14 +131,14 @@
 
   @Test
   @UseLocalDisk
-  @GerritConfig(name = "plugin.kafka-events.groupId", value = "test-consumer-group")
+  @GerritConfig(name = "plugin.events-kafka.groupId", value = "test-consumer-group")
   @GerritConfig(
-      name = "plugin.kafka-events.keyDeserializer",
+      name = "plugin.events-kafka.keyDeserializer",
       value = "org.apache.kafka.common.serialization.StringDeserializer")
   @GerritConfig(
-      name = "plugin.kafka-events.valueDeserializer",
+      name = "plugin.events-kafka.valueDeserializer",
       value = "org.apache.kafka.common.serialization.StringDeserializer")
-  @GerritConfig(name = "plugin.kafka-events.pollingIntervalMs", value = "500")
+  @GerritConfig(name = "plugin.events-kafka.pollingIntervalMs", value = "500")
   public void shouldReplayAllEvents() throws InterruptedException {
     String topic = "a_topic";
     EventMessage eventMessage =