Merge proposals dependent on lp:~raharper/curtin/fix-lp1531520

lp:~raharper/curtin/fix-lp1531520 has no merge proposals.