Merge pull request #1019 from jkczyz/2021-07-shutdown-pubkey

Fetch shutdown script based on `commit_upfront_shutdown_pubkey`

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

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