Merge branch 'master' into idempotency_resolvconf

.travis.yml

cluster.yml

contrib/terraform/openstack/README.md

contrib/terraform/openstack/ansible_bastion_template.txt

contrib/terraform/openstack/group_vars/all.yml

contrib/terraform/openstack/kubespray.tf

contrib/terraform/openstack/variables.tf

docs/calico.md

docs/ha-mode.md

inventory/group_vars/all.yml

roles/download/defaults/main.yml

roles/etcd/defaults/main.yml

roles/etcd/files/make-ssl-etcd.sh

roles/etcd/handlers/main.yml

roles/etcd/tasks/check_certs.yml

roles/etcd/tasks/configure.yml

roles/etcd/tasks/gen_certs.yml

roles/etcd/tasks/main.yml

roles/etcd/tasks/pre_upgrade.yml

roles/etcd/tasks/refresh_config.yml