SAK-27848 merge 312649 from trunk

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

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