Merge pull request #584 from chadswen/docker-options-refactor

inventory/group_vars/all.yml

roles/docker/tasks/main.yml

roles/docker/tasks/non-systemd.yml

roles/docker/tasks/systemd-proxies.yml

roles/docker/tasks/systemd.yml

roles/docker/templates/docker-options.conf.j2

roles/docker/templates/docker.service.j2

roles/docker/templates/http-proxy.conf.j2

roles/kubernetes/node/templates/kubelet-container.j2

roles/network_plugin/calico/tasks/main.yml

roles/network_plugin/calico/templates/docker

roles/network_plugin/flannel/tasks/main.yml

roles/network_plugin/flannel/templates/docker

roles/network_plugin/flannel/templates/docker-systemd

.../network_plugin/flannel/templates/flannel-options.conf.j2

roles/network_plugin/weave/tasks/main.yml

roles/network_plugin/weave/templates/docker