This gets rid of the unnecessary option count at the end of the
file and ensures that the config groups are ordered in a repeatable
way so adding an option won't shuffle the entire sample config.
The new config generator uses stevedore so I added that to
test-requirements too.
Change-Id: I5fa0e21ca19a4736ebb3ea9c31b683be5324e052