Merge pull request #1401 from TheBlueMatt/2022-02-0conf-round-two

Zero Conf Channels

diff --cc lightning/src/ln/channel.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/routing/router.rs
Simple merge

diff --cc lightning/src/util/test_utils.rs
Simple merge