Also fixed up some duplicate config options due to a bug in autohelp.py.
While working through duplication options, I believe I encountered some
that weren't being output, but I'd rather spend the time fixing the tool
than manually adding those.
Change-Id: I60eb035b97d354bc57168421facafd895ace2a10
20b6805c04