SAK-26354 merge 310300 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@310336 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26365 merge 310339 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@310340 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26365 merge 310341 to 10.x

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