Move more Doctrine related container settings in the appropriate CompilerPass.
Merge pull request #1854 from cmfcmf/doctrine-extensions-try-99999

Move more Doctrine related container settings in the appropriate CompilerPass