stemcell_builder: consolidate identical vsphere and vcloud stages into ovf specific stages