Fix deadlock during shutdown which prevented leader election cleanup

Fix deadlock during shutdown which prevented leader election cleanup #2138