config: changes for giza compatibility
DOCS-3328 initial cut
Merge remote-tracking branch 'upstream/master'