Merge branch '5.4' into 6.0

* 5.4:
  Typos In Comments
  remove duplicated catch block
  s/<\br>/<br>
  [HttpClient] Fix retrying requests when the content is used by the strategy

Author: fabpot

Resources/views/traces.html.php

@@ -12,7 +12,7 @@
                 $class = substr($exception['class'], $separator);
                 ?>
                 <?php if ('' === $class) { ?>
-                    </br>
+                    <br>
                 <?php } else { ?>
                     <h3 class="trace-class">
                         <?php if ('' !== $namespace) { ?>