SAK-27814 merge 313633, 313640 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@315254 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27572 merge 311032, 311104 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@315259 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27960 merge 314081 from trunk

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