Merge pull request #7020
e587bc3 Implement helper class for CTxMemPoolEntry constructor (Alex Morcos)