Merge proposals dependent on lp://staging/codetree

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