Merge pull request #18996 from ascherer/sort-casks-with-versions

Merge pull request #18996 from ascherer/sort-casks-with-versions #3825