fix reorg testing tool.
reorg test with double spending and everything.
Merge remote-tracking branch 'upstream/master'