KAFKA-1663 Controller unable to shutdown after a soft failure; reviewed by Neha Narkhede