Merge pull request #2623 from wpaulino/htlc-claim-receive-preimage-after-close