Merge "Fixes bugs in test_s3_ec2_images"