Merge pull request #577 from valentinewallace/fix-onchain-fee-check-htlcs