Merge pull request #2887 from benthecarman/htlc-timeout