Merge pull request #8787 from leoetlino/config-config Remove redundant Config prefix from ConfigInfo/ConfigLocation
