Merge proposals dependent on lp://qastaging/~rcj/livecd-rootfs/subiquity-fixes

lp://qastaging/~rcj/livecd-rootfs/subiquity-fixes has no merge proposals.