curtin

Merge proposals dependent on lp://staging/~raharper/curtin/trunk.fix-lp1615780

  1. trunk.fix-lp1615780
  2. Dependent merge proposals

lp://staging/~raharper/curtin/trunk.fix-lp1615780 has no merge proposals.