[1339941]
Adding puppet related changes to support vmware