Merge pull request #1966 from ViktorTigerstrom/2023-01-store-channels-per-peer-followups

1507 followups

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/reload_tests.rs
Simple merge