MDL-70010 core: reconcile MOODLE_310_STABLE and master