BLTI-244

Merge 127006, 127199



git-svn-id: https://source.sakaiproject.org/svn/basiclti/branches/basiclti-2.1.x@127200 66ffb92e-73f9-0310-93c1-f5514f145a0a