Merge pull request #1948 from sgmitchell/secured-etcd

roles/etcd/defaults/main.yml

roles/etcd/handlers/backup.yml

roles/etcd/handlers/main.yml

roles/etcd/tasks/configure.yml

roles/etcd/tasks/join_member.yml

roles/etcd/tasks/set_cluster_health.yml

roles/etcd/templates/etcd.env.j2

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

roles/network_plugin/calico/rr/tasks/main.yml

roles/network_plugin/calico/tasks/main.yml

roles/network_plugin/canal/tasks/main.yml

roles/network_plugin/canal/templates/cni-canal.conflist.j2

scripts/collect-info.yaml