config: sync with v3.6.9 tree config options

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>