Don't let cleanup fail in different envs
Zero out disk space only for virtualbox builder
Add AMI id for built machine