Pass conflicting height in CWallet::MarkConflicted
---
https://github.com/bitcoin/bitcoin/pull/15931/commits/36b68de5b2938722911db900ca299f7008780d01
Depends on D7513
Concludes backport of Core [[https://github.com/bitcoin/bitcoin/pull/15931 | PR15931]]