Merge branch 'MDL-66118-master-byebyemoodlenet' of git://github.com/mudrd8mz/moodle

diff --cc lang/en/admin.php
Simple merge

diff --cc lib/classes/hub/api.php
Simple merge

diff --cc lib/classes/hub/registration.php
Simple merge

diff --cc lib/classes/hub/site_registration_form.php
Simple merge

diff --cc lib/db/upgrade.php
index 5ab80e9,425deab..37a3784
--- 1/lib/db/upgrade.php
--- 2/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@@ -3556,5 -3556,23 +3556,23 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2019092700.01);
      }
  
 -    if ($oldversion < 2019100400.01) {
++    if ($oldversion < 2019100800.02) {
+         // Rename the official moodle sites directory the site is registered with.
+         $DB->execute("UPDATE {registration_hubs}
+                          SET hubname = ?, huburl = ?
+                        WHERE huburl = ?", ['moodle', 'https://stats.moodle.org', 'https://moodle.net']);
+ 
+         // Convert the hub site specific settings to the new naming format without the hub URL in the name.
+         $hubconfig = get_config('hub');
+ 
+         if (!empty($hubconfig)) {
+             foreach (upgrade_convert_hub_config_site_param_names($hubconfig, 'https://moodle.net') as $name => $value) {
+                 set_config($name, $value, 'hub');
+             }
+         }
+ 
 -        upgrade_main_savepoint(true, 2019100400.01);
++        upgrade_main_savepoint(true, 2019100800.02);
+     }
+ 
      return true;
  }

diff --cc version.php
index d49e526,5d86833..9abddbc
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2019100800.01;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2019100400.01;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2019100800.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.