Merge pull request #4474 from leoetlino/fewer-config-includes Remove unnecessary ConfigManager includes
