Merge pull request #2511 from jbesraa/add-channel-id-to-spendableoutputs-event

Add channel_id to SpendableOutputs event

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

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

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

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