Merge branch 'MDL-30634-master' of git://github.com/Dave-B/moodle

diff --cc auth/ldap/db/upgrade.php
index 3e1c58f,b5376fc..a6f7ced
--- 1/auth/ldap/db/upgrade.php
--- 2/auth/ldap/db/upgrade.php
+++ b/auth/ldap/db/upgrade.php
@@@ -48,5 -48,23 +48,23 @@@ function xmldb_auth_ldap_upgrade($oldve
      // Automatically generated Moodle v3.3.0 release upgrade line.
      // Put any upgrade step following this.
  
 -    if ($oldversion < 2017051501) {
++    if ($oldversion < 2017080100) {
+         // The "auth_ldap/coursecreators" setting was replaced with "auth_ldap/coursecreatorcontext" (created
+         // dynamically from system-assignable roles) - so migrate any existing value to the first new slot.
+         if ($ldapcontext = get_config('auth_ldap', 'creators')) {
+             // Get info about the role that the old coursecreators setting would apply.
+             $creatorrole = get_archetype_roles('coursecreator');
+             $creatorrole = array_shift($creatorrole); // We can only use one, let's use the first.
+ 
+             // Create new setting.
+             set_config($creatorrole->shortname . 'context', $ldapcontext, 'auth_ldap');
+ 
+             // Delete old setting.
+             set_config('creators', null, 'auth_ldap');
+ 
 -            upgrade_plugin_savepoint(true, 2017051501, 'auth', 'ldap');
++            upgrade_plugin_savepoint(true, 2017080100, 'auth', 'ldap');
+         }
+     }
+ 
      return true;
  }

diff --cc auth/ldap/version.php
index 5e96509,9997922..93ce0e7
--- 1/auth/ldap/version.php
--- 2/auth/ldap/version.php
+++ b/auth/ldap/version.php
@@@ -25,6 -25,6 +25,6 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
 -$plugin->version   = 2017051501;        // The current plugin version (Date: YYYYMMDDXX)
++$plugin->version   = 2017080100;        // The current plugin version (Date: YYYYMMDDXX)
  $plugin->requires  = 2017050500;        // Requires this Moodle version
  $plugin->component = 'auth_ldap';       // Full name of the plugin (used for diagnostics)