This is a port of https://github.com/apache/kafka/pull/5605 for the 1.1 branch
Passing system test on branch builder https://jenkins.confluent.io/job/system-test-kafka-branch-builder/1950/ and ### Committer Checklist (excluded from commit message) - [ ] Verify design and implementation - [ ] Verify test coverage and CI build status - [ ] Verify documentation (including upgrade notes) [ Full content available at: https://github.com/apache/kafka/pull/5609 ] This message was relayed via gitbox.apache.org for [email protected]
