Merge #11293: Deduplicate CMerkleBlock construction code, add test coverage