Merge proposals dependent on lp://staging/~andreserl/maas/1.10_packaging_improvements

lp://staging/~andreserl/maas/1.10_packaging_improvements has no merge proposals.