Merge branch 'MDL-68384-fix-spec-violations-310' of https://github.com/cengage/moodle...