Merge branch 'MDL-69776-master' of git://github.com/jleyva/moodle

diff --cc lib/db/services.php
Simple merge

diff --cc version.php
index 397c3c5,6df7210..403cafc
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,9 -29,9 +29,9 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2021052500.21;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2021052500.17;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2021052500.22;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.
 -$release  = '4.0dev (Build: 20200924)'; // Human-friendly version name
 +$release  = '4.0dev (Build: 20201009)'; // Human-friendly version name
  $branch   = '400';                      // This version's branch.
  $maturity = MATURITY_ALPHA;             // This version's maturity level.