Cherry pick vSphere deploy support into release-0.4 branch