Merge "Remove the ec2 api tests from tempest"