[MERGE] (robertc) Reconcile tweaks from the packs branch. (Robert Collins)

[Ian Clatworthy]

Robert Collins wrote:
> Minor tweaks to reconcile.py, and the blackbox reconcile test.

bb: tweak

> +    The goal of repository reconciliation is to make any derived daata

data, not daata.

Ian C.