Merge proposals dependent on lp:~dan-prince/nova/fix_image_id_s3

lp:~dan-prince/nova/fix_image_id_s3 has no merge proposals.