Merge pull request #1351 from TheBlueMatt/2022-03-scid-privacy

Implement the SCIDAlias Channel Type and provide SCID Privacy

diff --cc .github/workflows/build.yml
Simple merge

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

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

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