Merge branch 'master' into chef-provisioner-windows

Conflicts:
	provisioner/chef-client/provisioner.go
Fix file upload call
Merge branch 'chef-provisioner-windows' into winrm-merged-v0.7.1
Merge branch 'shell-provisioner-windows' into winrm-merged-v0.7.1
Merge branch 'vmware-support-winrm-port' into winrm-merged-v0.7.1