Forward-port #912, #917 and #911 (0.6.1 IBD and drain fixes) to master - #921

Forward-port #912, #917 and #911 (0.6.1 IBD and drain fixes) to master#921

bkeroack merged 3 commits into

masterepochbtc/satd:masterfrom

fix/fwdport-061-drain-and-pacerepochbtc/satd:fix/fwdport-061-drain-and-pacerCopy head branch name to clipboard