Cleanup and add more config help strings

Cleanup and add expanded helpstrings for the auto generated sample
config.

Change-Id: I2106d8efee9934e6a48e5d0184c5a63754816a74
Merge "Cleanup and add more config help strings"