Move CMerkleBlock and CPartialMerkleTree to their own file
Merge pull request #5181

afd4b94 Move CMerkleBlock and CPartialMerkleTree to their own file (Matt Corallo)
Fix missing python2 in rpc-tests
Merge pull request #5432

db0916b Fix missing python2 in rpc-tests (Matt Corallo)

Signed-off-by: Gavin Andresen <gavinandresen@gmail.com>