Merge pull request #1078 from TheBlueMatt/2021-09-chan-types

Implement channel_type negotiation

diff --cc lightning-background-processor/src/lib.rs
Simple merge

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

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