Merge branch 'master' into synthscale

roles/kubernetes/secrets/templates/openssl.conf.j2

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

roles/network_plugin/calico/tasks/main.yml

roles/network_plugin/flannel/handlers/main.yml

roles/reset/tasks/main.yml

roles/uploads/defaults/main.yml

roles/uploads/tasks/main.yml

roles/vault/tasks/bootstrap/main.yml

roles/vault/tasks/bootstrap/role_auth_cert.yml

roles/vault/tasks/bootstrap/role_auth_userpass.yml

roles/vault/tasks/cluster/main.yml