Small etcd script/test fixes