Register API options under the 'api' group

Register the API options under the 'api' group and change the name of
the options to be less redundant.

This patch also regenerates the sample config file.

Change-Id: I55ec0b977275a394fef059a6318540bb5186ddc0
Closes-Bug: #1244742
Merge "Register API options under the 'api' group"