Merge HTLC-update events, remove FailHTLC ErrorAction