Merge proposals dependent on lp://qastaging/~blake-rouse/maas/fix-pod-delete

lp://qastaging/~blake-rouse/maas/fix-pod-delete has no merge proposals.