Merge proposals dependent on lp://staging/~cloud-init-dev/cloud-init/trunk

lp://staging/~cloud-init-dev/cloud-init/trunk has no merge proposals.