Merge proposals dependent on lp://staging/commandant

lp://staging/commandant has no merge proposals.