Remove dependency on container, removing service locator antipattern
Merge pull request #8017 from Raydiation/master

Remove dependency on container, removing service locator antipattern