tools

 Conflicts:
	Jenkinsfile
	bin/kafka-run-class.sh
	build.gradle
	ci.py
	clients/src/main/java/org/apache/kafka/common/protocol/Errors.java
	core/src/main/scala/kafka/controller/KafkaController.scala
	core/src/main/scala/kafka/log/Log.scala
	core/src/main/scala/kafka/server/ReplicaManager.scala
	core/src/test/scala/unit/kafka/controller/ControllerIntegrationTest.scala
	core/src/test/scala/unit/kafka/server/KafkaApisTest.scala
	gradle.properties
	gradle/dependencies.gradle
	settings.gradle
	streams/quickstart/java/pom.xml
	streams/quickstart/java/src/main/resources/archetype-resources/pom.xml
	streams/quickstart/pom.xml
	tests/kafkatest/__init__.py
	tests/kafkatest/utils/util.py
 Additional updates to fix build:
	checkstyle/suppressions.xml
	clients/src/main/java/org/apache/kafka/common/metrics/Sensor.java
	ce-broker-plugins/src/main/java/io/confluent/kafka/multitenant/metrics/PartitionSensors.java