Merge pull request #1429 from TheBlueMatt/2022-04-drop-no-conn-possible

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

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

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

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