Backport remaining changes from Core PR 10742

Summary:
Partial backport of Core PR 10742
https://github.com/bitcoin/bitcoin/pull/10742/files
Completes T549

Test Plan:
make check
test_runner.py

Reviewers: #bitcoin_abc, deadalnix, Fabien

Reviewed By: #bitcoin_abc, Fabien

Subscribers: teamcity, schancel

Differential Revision: https://reviews.bitcoinabc.org/D2719