Remove dependency on container, removing service locator antipattern
Update controller.php

Backwards compability fix for faster merge ;)
Merge pull request #8119 from Raydiation/stable6

Remove dependency on container, removing service locator antipattern