Merge proposals dependent on lp:~julian-edwards/maas/doc-bug-1237398

lp:~julian-edwards/maas/doc-bug-1237398 has no merge proposals.