Merge branch 'master_MDL-71636-test-fix' of https://github.com/catalyst/moodle-MDL...