Merge proposals dependent on lp://staging/~evfool/update-manager/fix665173

lp://staging/~evfool/update-manager/fix665173 has no merge proposals.