Merge proposals dependent on lp://qastaging/~ubuntu-on-ec2/ubuntu-on-ec2/ec2-publishing-scripts.hvm-ephemeral

1. ec2-publishing-scripts.hvm-ephemeral
2. Dependent merge proposals