Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle

Conflicts:
	lib/db/upgrade.php
	lib/phpunit/lib.php
	version.php

Fixed:
    lib/db/upgrade.php - duplicate course->sectioncache add code
    lib/db/install.xml - cleanup needed because xmldb editor was not used
    lib/phpunit/classes/util.php - cleanup $GROUPLIB_CACHE on test reset

lib/phpunit/classes/util.php

@@ -542,7 +542,7 @@ class phpunit_util {
      * @return void
      */
     public static function reset_all_data($logchanges = false) {
-        global $DB, $CFG, $USER, $SITE, $COURSE, $PAGE, $OUTPUT, $SESSION;
+        global $DB, $CFG, $USER, $SITE, $COURSE, $PAGE, $OUTPUT, $SESSION, $GROUPLIB_CACHE;
 
         // reset global $DB in case somebody mocked it
         $DB = self::get_global_backup('DB');
@@ -612,6 +612,7 @@ class phpunit_util {
         get_string_manager()->reset_caches();
         events_get_handlers('reset');
         textlib::reset_caches();
+        $GROUPLIB_CACHE = null;
         //TODO: add more resets here and probably refactor them to new core function
 
         // purge dataroot directory