Remove panics in discoverd/etcd test runners