adjust to RoutingExtraBundle => RoutingBundle rename
Merge remote-tracking branch 'origin/master' into current-menu-item
adjust to RoutingExtra rename and cmf_request_aware tag