Revert configuration sample update from previous commit

The patch Iad73f75694ef21223165e34406830138784c6fc1 made some
wrong changes to our sample. This is because our generator
doesn't work when two options (in different groups)
have the exact same description message.

Change-Id: I1e8aa162a4063e96862958446f19a98758bc61b1