Merge branch 'MDL-66392' of https://github.com/paulholden/moodle into master

diff --cc lib/db/upgrade.php
index 697d9de,fe27f11..b9c5d34
--- 1/lib/db/upgrade.php
--- 2/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@@ -2816,40 -2816,15 +2816,51 @@@ function xmldb_main_upgrade($oldversion
      }
  
      if ($oldversion < 2021052500.29) {
 -        upgrade_main_savepoint(true, 2021052500.29);
 +        // Get the current guest user which is also set as 'deleted'.
 +        $guestuser = $DB->get_record('user', ['id' => $CFG->siteguest, 'deleted' => 1]);
 +        // If there is a deleted guest user, reset the user to not be deleted and make sure the related
 +        // user context exists.
 +        if ($guestuser) {
 +            $guestuser->deleted = 0;
 +            $DB->update_record('user', $guestuser);
 +
 +            // Get the guest user context.
 +            $guestusercontext = $DB->get_record('context',
 +                ['contextlevel' => CONTEXT_USER, 'instanceid' => $guestuser->id]);
 +
 +            // If the guest user context does not exist, create it.
 +            if (!$guestusercontext) {
 +                $record = new stdClass();
 +                $record->contextlevel = CONTEXT_USER;
 +                $record->instanceid = $guestuser->id;
 +                $record->depth = 0;
 +                // The path is not known before insert.
 +                $record->path = null;
 +                $record->locked = 0;
 +
 +                $record->id = $DB->insert_record('context', $record);
 +
 +                // Update the path.
 +                $record->path = '/' . SYSCONTEXTID . '/' . $record->id;
 +                $record->depth = substr_count($record->path, '/');
 +                $DB->update_record('context', $record);
 +            }
 +        }
 +
 +        // Main savepoint reached.
 +        upgrade_main_savepoint(true, 2021052500.29);
 +    }
 +
++    if ($oldversion < 2021052500.30) {
+         // Reset analytics model output dir if it's the default value.
+         $modeloutputdir = get_config('analytics', 'modeloutputdir');
+         if (strcasecmp($modeloutputdir, $CFG->dataroot . DIRECTORY_SEPARATOR . 'models') == 0) {
+             set_config('modeloutputdir', '', 'analytics');
+         }
+ 
+         // Main savepoint reached.
++        upgrade_main_savepoint(true, 2021052500.30);
+     }
+ 
      return true;
  }

diff --cc version.php
index 13d2577,13d2577..ed02323
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
--$version  = 2021052500.29;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2021052500.30;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
  $release  = '4.0dev (Build: 20201021)'; // Human-friendly version name