Clean up config help text

These are suggestions to clean up the help text.

Change-Id: If22c6491b530da92ee1ce6411b57f0585817de38
Cleanup config.py

Trailing , on last entry for each section.

Put ] on its own line.

This will make reviews look better since don't have to change as
much to add a config option and also lead to fewer merge conflicts
since fewer lines are changed.

Change-Id: I58d8d826404f0b13975f114ddb3465f2773d6942
Merge "Clean up config help text"
Merge "Cleanup config.py"