Merge pull request #6168
7f68c7d contrib/linearize: Support linearization of testnet blocks (Jeff Garzik)