Merge pull request #591 from kubernetes-incubator/etcdtls

roles/etcd/templates/openssl.conf.j2

...es-apps/ansible/templates/calico-policy-controller.yml.j2

roles/kubernetes/master/defaults/main.yml

roles/kubernetes/master/tasks/pre-upgrade.yml

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

roles/kubernetes/node/templates/cni-calico.conf.j2

roles/kubernetes/preinstall/defaults/main.yml

roles/kubernetes/preinstall/tasks/set_facts.yml

roles/network_plugin/calico/defaults/main.yml

roles/network_plugin/calico/tasks/main.yml

roles/network_plugin/calico/templates/calico-node.service.j2

roles/network_plugin/calico/templates/calicoctl-container.j2

roles/network_plugin/calico/templates/network-environment.j2

roles/network_plugin/flannel/tasks/main.yml

roles/network_plugin/flannel/templates/flannel-pod.yml

roles/network_plugin/flannel/templates/network.json

roles/uploads/defaults/main.yml