SAK-27841 merge 314101 from trunk

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

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