Allow multiple states to be passed to wait_for_service, continue to default to ENABLED
Delete volume after terminating instance.