Merge pull request #1555 from tnull/2022-06-prefer-small-htlc-max