Merge proposals dependent on lp://staging/~allenap/maas/move-registry-stuff-back-for-now

lp://staging/~allenap/maas/move-registry-stuff-back-for-now has no merge proposals.