SAK-26125 SAK-26047 SAK-26048 SAK-25783 SAK-24069 SAK-26184 merge 307823 307830 308285 308965 308966 309087 309088 309174 to 10.x

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