Merge proposals dependent on lp:~allenap/maas/command-line-return-of-argparse

lp:~allenap/maas/command-line-return-of-argparse has no merge proposals.