Merge proposals dependent on lp://staging/~brendan-donegan/maas/boot_resources_2.0

lp://staging/~brendan-donegan/maas/boot_resources_2.0 has no merge proposals.