Resolve merge conflict introduced while trying to land D173

Summary: Removed merge conflicts.

Test Plan: qa/rpc-tests/abc-cmdline.py

Reviewers: #bitcoin_abc, deadalnix, sickpig, kyuupichan

Reviewed By: #bitcoin_abc, deadalnix

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