Merge pull request #1527 from wpaulino/update-htlc-relay-policy