Some left overs from PR12490

Summary:
Looks like this was partially done in D3978.

Partial backport of Core PR12490

Test Plan:

cmake -GNinja -DBUILD_BITCOIN_WALLET=OFF ..
ninja
ninja check
ninja check-functional
./bitcoind
./bitcoin-cli getnewaddress

Verify rpc fails because there is no wallet.

Reviewers: O1 Bitcoin ABC, #bitcoin_abc, deadalnix

Reviewed By: O1 Bitcoin ABC, #bitcoin_abc, deadalnix

Subscribers: deadalnix

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