Change logic to get source image from images.yml if Cloud type is an AWS
Merge branch 'feature/add-base-ami-id' into develop