Merge branch '4.4' into 5.0

* 4.4:
  Removed merge conflict
  Follow up to remove the debug component

Author: OskarStark

_build/redirection_map

@@ -428,7 +428,6 @@
 /contributing/community/other /contributing/community
 /profiler/storage /profiler
 /setup/composer /setup
-<<<<<<< HEAD
 /security/security_checker /setup
 /setup/built_in_web_server /setup/symfony_server
 /service_container/parameters /configuration
@@ -448,7 +447,7 @@
 /console/request_context /routing
 /form/action_method /forms
 /reference/requirements /setup
- /bundles/inheritance /bundles/override
+/bundles/inheritance /bundles/override
 /templating /templates
 /templating/escaping /templates
 /templating/syntax /templates

components/phpunit_bridge.rst

@@ -311,8 +311,8 @@ Deprecation Notices at Autoloading Time
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 By default, the PHPUnit Bridge uses ``DebugClassLoader`` from the
-:doc:`Debug component </components/debug>` to throw deprecation notices at
-class autoloading time. This can be disabled with the ``debug-class-loader`` option.
+`Debug component`_ to throw deprecation notices at class autoloading time.
+This can be disabled with the ``debug-class-loader`` option.
 
 .. code-block:: xml
 
@@ -962,3 +962,4 @@ not find the SUT:
 .. _`test listener`: https://phpunit.de/manual/current/en/appendixes.configuration.html#appendixes.configuration.test-listeners
 .. _`@covers`: https://phpunit.de/manual/current/en/appendixes.annotations.html#appendixes.annotations.covers
 .. _`PHP namespace resolutions rules`: https://php.net/manual/en/language.namespaces.rules.php
+.. _Debug component: https://github.com/symfony/debug