Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle

Conflicts:
	lib/upgrade.txt

diff --cc admin/cli/install.php
Simple merge

diff --cc install.php
Simple merge

diff --cc lib/accesslib.php
Simple merge

diff --cc lib/classes/component.php
Simple merge

diff --cc lib/dml/tests/dml_test.php
Simple merge

diff --cc lib/editor/tinymce/lib.php
Simple merge

diff --cc lib/formslib.php
Simple merge

diff --cc lib/moodlelib.php
Simple merge

diff --cc lib/outputrenderers.php
Simple merge

diff --cc lib/outputrequirementslib.php
Simple merge

diff --cc lib/phpunit/classes/util.php
Simple merge

diff --cc lib/setuplib.php
Simple merge

diff --cc lib/upgrade.txt
index f7fc350,d10b3d1..29a297f
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -13,9 -13,8 +13,11 @@@ information provided here is intended e
  * New $CFG->localcachedir setting useful for cluster nodes. Admins have to update X-Sendfile aliases if used.
  * MS SQL Server drivers are now using NVARCHAR(MAX) instead of NTEXT and VARBINARY(MAX) instead of IMAGE,
    this change should be fully transparent and it should help significantly with add-on compatibility.
 +* The string manager classes were renamed. Note that they should not be modified or used directly,
 +  always use get_string_manager() to get instance of the string manager.
 +* The ability to use an 'insecure' rc4encrypt/rc4decrypt key has been removed.
+ * Use $CFG->debugdeveloper instead of debugging('', DEBUG_DEVELOPER).
+ * Use set_debugging(DEBUG_xxx) when changing debugging level for current request.
  
  DEPRECATIONS:
  Various previously deprecated functions have now been altered to throw DEBUG_DEVELOPER debugging notices

diff --cc lib/upgradelib.php
Simple merge

diff --cc lib/weblib.php
Simple merge