Merge branch 'w35_MDL-41245_m26_pluginuninstall' of https://github.com/skodak/moodle