Merge branch '3.4' into 4.4

* 3.4:
  fixing typo
  Replace deprecated ObjectManager
  [Security] renamed memory provider
  [Security] Various minor fixes in XML config

Author: HeahDude

frontend/encore/simple-example.rst

@@ -332,7 +332,7 @@ If you want to only compile a CSS file, that's possible via ``addStyleEntry()``:
 
 .. code-block:: javascript
 
-    // webpack/config.js
+    // webpack.config.js
     Encore
         // ...