Fix bad merge of symfony-submodule branch into integration