Adjust ClusterSingletonManager to new Exiting behaviour, see #3309