Merge pull request #16730 from soltysh/etcd_bump

Automatic merge from submit-queue.

bump etcd to 3.2.8

This bumps etcd and performs additional cleanups needed for our restoration to work properly.

Author: openshift-merge-robot

Diff for: Godeps/Godeps.json

@@ -56,8 +56,7 @@ preload-remote "github.com/openshift" "origin" "github.com/openshift" "origin" #
 preload-remote "k8s.io" "kubernetes" "github.com/openshift" "kubernetes"
 preload-remote "github.com/docker" "distribution" "github.com/openshift" "docker-distribution"
 preload-remote "github.com/skynetservices" "skydns" "github.com/openshift" "skynetservices-skydns"
-preload-remote "github.com/coreos" "etcd" "github.com/openshift" "coreos-etcd"
-preload-remote "github.com/emicklei" "go-restful" "github.com/openshift" "emicklei-go-restful-swagger12"
+preload-remote "github.com/emicklei" "go-restful-swagger12" "github.com/openshift" "emicklei-go-restful-swagger12"
 preload-remote "github.com/cloudflare" "cfssl" "github.com/openshift" "cloudflare-cfssl"
 preload-remote "github.com/google" "certificate-transparency" "github.com/openshift" "google-certificate-transparency"
 preload-remote "github.com/google" "cadvisor" "github.com/openshift" "google-cadvisor"