tools: Display per-command help appropriately
tools: Display per-command help appropriately

 * Fixes a regression
 * In addition allows --help to be specified before the command. If
   a command is present, command help will be shown

https://bugs.freedesktop.org/show_bug.cgi?id=62153

lkundrak/p11-kit,lkundrak/p11-kit,freedesktop-unofficial-mirror/p11-glue__p11-kit,pspacek/p11-kit,Distrotech/p11-kit,pspacek/p11-kit,pspacek/p11-kit,freedesktop-unofficial-mirror/p11-glue__p11-kit,lkundrak/p11-kit,pspacek/p11-kit,Distrotech/p11-kit,Distrotech/p11-kit,Distrotech/p11-kit,freedesktop-unofficial-mirror/p11-glue__p11-kit