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