Merge pull request #2800 from optout21/channel-close-add-funding