Merge branch 'MDL-40250-master' of git://github.com/ankitagarwal/moodle

diff --cc phpunit.xml.dist
index 4c205ac,dba2332..123db5a
--- 1/phpunit.xml.dist
--- 2/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@@ -42,10 -42,8 +42,11 @@@
          </testsuite>
          <testsuite name="core_files">
              <directory suffix="_test.php">lib/filestorage/tests</directory>
+             <directory suffix="_test.php">files/tests</directory>
          </testsuite>
 +        <testsuite name="core_role">
 +            <directory suffix="_test.php">admin/roles/tests</directory>
 +        </testsuite>
          <testsuite name="core_cohort">
              <directory suffix="_test.php">cohort/tests</directory>
          </testsuite>