Merge branch 'stable-3.3' into stable-3.4

* stable-3.3:
  Use new kafka broker name

Change-Id: I4204dacfce7a32dd3634232409773b4ac6a9ee87

setup_local_env/configs/gerrit.config

diff --git a/setup_local_env/configs/gerrit.config b/setup_local_env/configs/gerrit.config
index 368f94d..c4df06a 100644
--- a/setup_local_env/configs/gerrit.config
+++ b/setup_local_env/configs/gerrit.config
@@ -40,7 +40,7 @@
     allowRemoteAdmin = true
 [plugin "websession-flatfile"]
     directory = $FAKE_NFS
-[plugin "kafka-events"]
+[plugin "events-kafka"]
     sendAsync = true
     bootstrapServers = localhost:$BROKER_PORT
     groupId = $GROUP_ID

setup_local_env/setup.sh

diff --git a/setup_local_env/setup.sh b/setup_local_env/setup.sh
index e399605..bebc863 100755
--- a/setup_local_env/setup.sh
+++ b/setup_local_env/setup.sh
@@ -434,9 +434,9 @@
 ing"; exit 1; }
 
 if [ "$BROKER_TYPE" = "kafka" ]; then
-echo "Downloading kafka-events plugin $GERRIT_BRANCH"
-  wget $GERRIT_CI/plugin-kafka-events-bazel-$GERRIT_BRANCH/$LAST_BUILD/kafka-events/kafka-events.jar \
-  -O $DEPLOYMENT_LOCATION/kafka-events.jar || { echo >&2 "Cannot download kafka-events plugin: Check internet connection. Abort\
+echo "Downloading events-kafka plugin $GERRIT_BRANCH"
+  wget $GERRIT_CI/plugin-events-kafka-bazel-$GERRIT_BRANCH/$LAST_BUILD/events-kafka/events-kafka.jar \
+  -O $DEPLOYMENT_LOCATION/events-kafka.jar || { echo >&2 "Cannot download events-kafka plugin: Check internet connection. Abort\
 ing"; exit 1; }
 fi
 
@@ -511,7 +511,7 @@
   elif [ $BROKER_TYPE = "gcloud-pubsub" ]; then
     cp -f $DEPLOYMENT_LOCATION/events-gcloud-pubsub.jar $LOCATION_TEST_SITE_1/plugins/events-gcloud-pubsub.jar
   else
-     cp -f $DEPLOYMENT_LOCATION/$BROKER_TYPE-events.jar $LOCATION_TEST_SITE_1/plugins/$BROKER_TYPE-events.jar
+    cp -f $DEPLOYMENT_LOCATION/events-kafka.jar $LOCATION_TEST_SITE_1/plugins/events-kafka.jar
   fi
 
   echo "Copy metrics-reporter-prometheus plugin"