Changing the provisioning of Esxi

Change-Id: Ie1fb569357973e875769e14b636ef31030f3cf9d
Merge "Changing the provisioning of Esxi"
Merge remote-tracking branch 'upstream/master'