Feature #2097: Get rid of VMware DS
Get rid of VMware specific code in TM shared