Change Details

PR11258 backport https://github.com/bitcoin/bitcoin/pull/11258/files (just first commit; I'm omitting the second commit which just does inapplicable reformatting)

PR11258 backport https://github.com/bitcoin/bitcoin/pull/11258/files Just first commit; I'm omitting the second commit which just does inapplicable reformatting. Also, modified to use pushKV .

PR11258 backport https://github.com/bitcoin/bitcoin/pull/11258/files (jJust first commit; I'm omitting the second commit which just does inapplicable reformatting). Also, modified to use pushKV .