Merge proposals dependent on lp://staging/~spundun/bzr-colo/fixes

lp://staging/~spundun/bzr-colo/fixes has no merge proposals.