Merge proposals dependent on lp:~julian-edwards/maas/disabletests

lp:~julian-edwards/maas/disabletests has no merge proposals.