Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle

Conflicts:
	lib/upgrade.txt

diff --cc lib/upgrade.txt
index 61f80d1,964b5ce..e58fe6d
--- 1/lib/upgrade.txt
--- 2/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@@ -19,8 -19,7 +19,9 @@@ information provided here is intended e
  * Use $CFG->debugdeveloper instead of debugging('', DEBUG_DEVELOPER).
  * Use set_debugging(DEBUG_xxx) when changing debugging level for current request.
  * Function moveto_module() does not modify $mod argument and instead now returns the new module visibility value.
 +* Use behat_selectors::get_allowed_text_selectors() and behat_selectors::get_allowed_selectors() instead of
 +  behat_command::$allowedtextselectors and behat_command::$allowedselectors
+ * Subplugins are supported in admin tools and local plugins.
  
  DEPRECATIONS:
  Various previously deprecated functions have now been altered to throw DEBUG_DEVELOPER debugging notices