More fixes to ensure prompt termination of HA if no servers available to perform HA