Merge branch '3.4' into 4.4

* 3.4:
  Fix abstract method name in PHP doc block

src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php

@@ -23,7 +23,7 @@
 /**
  * AnnotationClassLoader loads routing information from a PHP class and its methods.
  *
- * You need to define an implementation for the getRouteDefaults() method. Most of the
+ * You need to define an implementation for the configureRoute() method. Most of the
  * time, this method should define some PHP callable to be called for the route
  * (a controller in MVC speak).
  *