[vsphere|compute] cleanup merge conflicts with clone method
Merge pull request #1740 from aussielunix/vsphere-clone-conflicts

[vsphere|compute] cleanup merge conflicts with clone method