Re-order usage message and disable it for errors
Re-order usage message and disable it for errors

This commit disables the display of the usage message when errors are
generated.  It also fixes a small issue in the usage message itself.
The template usage information was incorrectly displayed before
the description of the flags.  It now appears after.

Signed-off-by: Mark Ryan <f16215f7acd0bd7fdc465539215bd574c785b062@intel.com>

01org/ciao,01org/ciao,ciao-project/ciao,ciao-project/ciao