Merge pull request #2138 from swilliamson5/replace-our-max-htlcs-constant