KAFKA-589 Clean shutdown after startup connection failure; reviewed by Neha Narkhede