Merge proposals dependent on lp://qastaging/~mwhudson/livecd-rootfs/no-curtin-installer

lp://qastaging/~mwhudson/livecd-rootfs/no-curtin-installer has no merge proposals.