[config] fix typo's
[config] fix typo's
Merge remote-tracking branch 'upstream/master'