Merge pull request #3878 from marcinslusarz/merge15

ChangeLog

src/test/pmempool_check/out32.log.match

src/test/pmempool_info/out24.log.match

src/test/pmempool_sync/out28.log.match

src/test/pmempool_sync/out31.log.match

src/test/util_badblock/err8.log.match

src/test/util_badblock/out1.log.match

src/test/util_badblock/out2.log.match

src/test/util_badblock/out3.log.match

src/test/util_badblock/out4.log.match

src/test/util_badblock/out8.log.match