KAFKA-763 follow up changes; reviewed by Neha Narkhede