Merge pull request #1825 from wpaulino/anchors-bump-htlc-resolution-event