Extract common AMI-creation code.
Merge branch 'refactor_ami_creation'