Graceful shutdown times out quite often

start 2 instances, stop one the leader, it will wait for 3 seconds and report a timeout, but it shouldn't

assigned to @gmoshkin

mentioned in merge request !219 (merged)

closed with merge request !219 (merged)