Merge proposals dependent on lp://qastaging/~smoser/ubuntu-on-ec2/ec2-publishing-scripts.query-dl-arm-data

1. ec2-publishing-scripts.query-dl-arm-data
2. Dependent merge proposals