Merge proposals dependent on lp://staging/config-manager

lp://staging/config-manager has no merge proposals.