Adding changes in support of VM -> Template provisioning