Fix errors in help rendering:

- Put plugin-generated options into the correct order.
- Include the option-name in the detailed help list.
- Add missing metavars.

Bugs closed: aurora-831

Reviewed at https://reviews.apache.org/r/26688/