Merge pull request #1311 from TheBlueMatt/2022-02-0conf-part-1

Support for SCID Aliases

diff --cc fuzz/src/router.rs
Simple merge

diff --cc lightning-invoice/src/utils.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/onion_route_tests.rs
Simple merge

diff --cc lightning/src/routing/router.rs
Simple merge