Align columns across groups in --help output.

Patch from Leo Goodstadt.
Fixes #6114.


[SVN r86571]