Merge proposals dependent on lp:~rvb/maas/fix-doc-link

lp:~rvb/maas/fix-doc-link has no merge proposals.