Fixed manual failover + etcd failover