Merge proposals dependent on lp://staging/~andreserl/maas/fix_packaging_2

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