Merge proposals dependent on lp:~curtin-dev/curtin/trunk

lp:~curtin-dev/curtin/trunk has no merge proposals.