Merge branch 'MDL-68800-lti-gbs-patch-fixes' of https://github.com/cengage/moodle