Added option to make automatic cleanup optional.  We occasionally want to turn off cleanup when we want to automate load against a loadbalancer and then study the underlying vm without the system deleting it