Merge proposals dependent on lp://qastaging/~jason-hobbs/maas/sd5v1-support

lp://qastaging/~jason-hobbs/maas/sd5v1-support has no merge proposals.