Merge proposals dependent on lp:~blake-rouse/maas/fix-broken-ui

lp:~blake-rouse/maas/fix-broken-ui has no merge proposals.