Revision 1884481

Merge r1882157 from trunk:

 * r1882157
   Do not suggest --help -v for commands which do not support -v.
   Justification:
     The --help message for several commands is misleading. User complained.
   Votes:
     +1: stsp, brane, jcorvel