merge the rest of the changes from ec2test into master