BLTI-261

Merge r127984 



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

127985 BLTI-259
127990, 127998 BLTI-254



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

From 128517 



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

From 128861 128868 



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

From 128880  




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

From 128952 128956



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

128672 



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

128958



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