Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords

Conflicts:
	phpBB/includes/functions.php

phpBB/config/services.yml

@@ -170,11 +170,6 @@ services:
 
     filesystem:
         class: phpbb\filesystem
-        arguments:
-            - @symfony_request
-            - %core.root_path%
-            - %core.php_ext%
-            - %core.adm_relative_path%
 
     groupposition.legend:
         class: phpbb\groupposition\legend
@@ -252,6 +247,15 @@ services:
             - %tables.notifications%
             - %tables.user_notifications%
 
+    path_helper:
+        class: phpbb\path_helper
+        arguments:
+            - @symfony_request
+            - @filesystem
+            - %core.root_path%
+            - %core.php_ext%
+            - %core.adm_relative_path%
+
     php_ini:
         class: phpbb\php\ini
 
@@ -266,7 +270,7 @@ services:
     template:
         class: phpbb\template\twig\twig
         arguments:
-            - @filesystem
+            - @path_helper
             - @config
             - @user
             - @template_context