TwigExtractor tests require the Finder component
Merge branch '2.3' into 2.5

* 2.3:
  TwigExtractor tests require the Finder component

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
Merge branch '2.5'

* 2.5:
  TwigExtractor tests require the Finder component
  [Routing] fix BC

Conflicts:
	src/Symfony/Bridge/Twig/composer.json