Merge proposals dependent on lp://staging/~rvb/maas/add-version-switcher

lp://staging/~rvb/maas/add-version-switcher has no merge proposals.