SAK-26324 merge 313907 from trunk

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

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