Merge pull request #565 from apache/aws-ec2

AWS-EC2 Extension