Test for merging HTLC outputs and commitment tx outputs in one claim #536
Description
We should add a test to cover the cases where we spend (or don't want to spend) from an HTLC output in a claim tx that also spends from the underlying commitment tx. #535 (comment)