Ubuntu on EC2

Merge proposals dependent on lp://qastaging/~ubuntu-on-ec2/ubuntu-on-ec2/ec2-test

  1. ec2-test
  2. Dependent merge proposals

lp://qastaging/~ubuntu-on-ec2/ubuntu-on-ec2/ec2-test has no merge proposals.