bump(coreos-base/coretest): include fixes for etcd cluster