Merge branch '2.2' into 2.3

* 2.2:
  Revert "merged branch fabpot/event-dispatcher-debug (PR #9068)"

Conflicts:
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
	src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterListenersPassTest.php
Merge branch '2.3'

* 2.3:
  Revert "merged branch fabpot/event-dispatcher-debug (PR #9068)"