Fix HTLC-output-in-commitment sorting for duplicate-HTLCs