Ubuntu on EC2

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

  1. ami-pages
  2. Dependent merge proposals

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