Stop sorting options on output

The option definitions within a group should not be sorted, since the
application or library developer may want to present them in a
particular logical order to make them easier to understand

Change-Id: I35bf14ad469fd98486cb02ce66c5bfde5e4f1b11
Closes-Bug: #1356591