SAK-22649 merge r113275 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/assignment-2.9.x@118845 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22631 merge r113298 from trunk

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