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

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