Revert "Bumping etcd and go etcd to get rid of flakines"

This reverts commit b6333985d3f2f2d156fc5573a84de9dc772f6753.