fix default config option types

Change-Id: I4bea0b5e12d229b0d9188e10c70996a5606aa970
Fixes: bug #1167318
Merge "fix default config option types"