Merge branch 'master' into issue_1107-docker-versioning

roles/etcd/tasks/install_host.yml

roles/etcd/tasks/main.yml

roles/kernel-upgrade/tasks/main.yml

...tes/master/templates/manifests/kube-apiserver.manifest.j2

...r/templates/manifests/kube-controller-manager.manifest.j2

roles/kubernetes/node/templates/kubelet.j2

...ubernetes/node/templates/manifests/kube-proxy.manifest.j2

roles/kubernetes/preinstall/defaults/main.yml

roles/kubernetes/preinstall/meta/main.yml

roles/kubernetes/preinstall/tasks/etchosts.yml

roles/kubernetes/preinstall/tasks/main.yml

roles/kubernetes/preinstall/tasks/set_facts.yml

.../kubernetes/preinstall/tasks/vsphere-credential-check.yml

...s/kubernetes/preinstall/templates/vsphere-cloud-config.j2

roles/kubernetes/secrets/tasks/check-certs.yml

roles/kubernetes/secrets/tasks/gen_certs_script.yml

roles/kubernetes/secrets/tasks/main.yml

roles/vault/tasks/main.yml

upgrade-cluster.yml