Merge branch '3.4' into 4.0

* 3.4:
  [SecurityBundle] fix setLogoutOnUserChange calls for context listeners
  [DI] Register singly-implemented interfaces when doing PSR-4 discovery
  Fix for missing whitespace control modifier in form layout

Author: Robin Chalas

Resources/views/Form/form_div_layout.html.twig

@@ -347,7 +347,7 @@
         {% if not child.rendered %}
             {{- form_row(child) -}}
         {% endif %}
-    {%- endfor %}
+    {%- endfor -%}
 
     {% if not form.methodRendered and form is rootform %}
         {%- do form.setMethodRendered() -%}
@@ -361,7 +361,7 @@
         {%- if form_method != method -%}
             <input type="hidden" name="_method" value="{{ method }}" />
         {%- endif -%}
-    {% endif %}
+    {% endif -%}
 {% endblock form_rest %}
 
 {# Support #}