Bug #1794: Make vmfs/cp and vmware/cp more robust
(cherry picked from commit 3193a4b8df2504606f4b3b1116edf5323e359171)

Conflicts:
	src/datastore_mad/remotes/vmware/cp