[FrameworkBundle] fix merge of 3.3 into 3.4#25510

nicolas-grekas merged 1 commit intosymfony:3.4symfony/symfony:3.4from

dmaicher:fix-mergedmaicher/symfony:fix-mergeCopy head branch name to clipboard