BLTI-248

Merge into 2.1.x



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

Merge into 2.1.x



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