Merge branch 'm_MDL-30935_lti_change_instructor_role_to_teacher' of git://github...