Merge branch 'master' into chef-provisioner-windows

Conflicts:
	provisioner/chef-client/provisioner.go
Fix file upload call