Upgrade Symfony2

Makes the code ready for Symfony 2.3 upgrade.