fix support for VMware vCenter Driver

Change-Id: Iedd26dbb89731f49718604eb09eb84b3e0b648c0
Merge "fix support for VMware vCenter Driver"