Merge branch 'develop' of https://github.com/phpbb/phpbb into ticket/11997

Conflicts:
	tests/functional/fixtures/ext/foo/bar/config/services.yml

tests/functional/extension_controller_test.php

@@ -19,6 +19,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	static protected $fixtures = array(
 		'foo/bar/config/',
 		'foo/bar/controller/',
+		'foo/bar/event/',
+		'foo/bar/language/en/',
 		'foo/bar/styles/prosilver/template/',
 	);