Merge pull request #2065 from apache/jbilleter/click

Fixes for Click 8.2 and 8.3