SAK-26350 merge 311241 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315308 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26631 merge 310816, 313812 from trunk

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