Merge proposals dependent on lp://staging/~mikemc/maas/packaging-fix-1346538

lp://staging/~mikemc/maas/packaging-fix-1346538 has no merge proposals.