Code review comment for lp://staging/~jameinel/bzr-pipeline/2.6-compat

If we're going to do a minimal-change update for 2.6 support, I think it should be in stable, which the releases are cut from, not trunk. This branch won't merge cleanly into stable (i.e. it brings in trunk changes), so I will just re-do it in stable.