SAK-27865 merge 314039 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315393 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26607 merge 315128 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315394 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27787 merge 311748 from trunk

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