Merge pull request #2288 from wpaulino/rust-bitcoin-30-prereqs

diff --cc lightning-background-processor/src/lib.rs
Simple merge

diff --cc lightning/src/ln/channelmanager.rs
Simple merge

diff --cc lightning/src/ln/functional_test_utils.rs
Simple merge

diff --cc lightning/src/ln/functional_tests.rs
Simple merge

diff --cc lightning/src/ln/monitor_tests.rs
Simple merge

diff --cc lightning/src/ln/payment_tests.rs
Simple merge

diff --cc lightning/src/ln/reorg_tests.rs
Simple merge