Fix juju Environment bootstrap if cleanup is enabled