Merge pull request #2610 from wpaulino/missing-htlc-claim-balance