SAK-26363 merge 310443 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@311452 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26198 merge 310352 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@311453 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26257 merge 309863 to 10.x

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