KAFKA-1432 followup - Fixing the shutdown sequence furthermore; reviewed by Neha Narkhede