EC2 Automated Tests

Merge proposals dependent on lp://staging/~oddbloke/ec2-automated-tests/use-new-location

  1. use-new-location
  2. Dependent merge proposals

lp://staging/~oddbloke/ec2-automated-tests/use-new-location has no merge proposals.