kconfig: bugfix and tristate refactor

Clayton Craftrequested to merge
craftyguy/kconfig-tristate-fixes into master

See commit messages for details

fixes #2665 (closed)

Merge request reports