Issue #2269323 by amitgoyal, alexpott: Fixed Clean up ConfigImporter.
Issue #2269385 by sun: Fixed DependencyInjection YamlFileLoader is out of date.