Merge pull request #2174 from vkarak/doc/sort-cmd-options

[doc] Sort command line options and environment variables alphabetically in `-h` output and the man page

Author: Vasileios Karakasis