Bug#684700 -h and --help options are broken

Post-review fixes: realign help text to match
exactly GNU tools (21st column), reorder help
messages to provide most relvant options first,
edit help text, print values for default options.