Merge pull request #5432

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

Signed-off-by: Gavin Andresen <gavinandresen@gmail.com>
Add header-only option to getblock
Add CMerkleBlock constructor for tx set + block and an empty one
Add RPC call to generate and verify merkle blocks