Merge proposals dependent on lp://staging/~spiv/bzr/refactor-per_tree

lp://staging/~spiv/bzr/refactor-per_tree has no merge proposals.