Follow up MR for AWS support with several fixes including better AMI handling and Security group naming