(#20776) replace --vmrun with --hypervisor and deprecate --vmrun
(#20969) use the correct path separator for windows
Use linked clones (copy-on-write)
Merge pull request #462 from anodelman/remove-vmrun

(#20776) replace --vmrun with --hypervisor and deprecate --vmrun
Merge pull request #463 from anodelman/fix-win-command

(#20969) use the correct path separator for windows
Removing set-delta-disk code
Merge pull request #464 from puppetlabs/vcloud_linked_clones

Use linked clones (copy-on-write)
Merge branch 'master' into ntpdate-lib

Conflicts:
	lib/puppet_acceptance/utils/vm_control.rb