SAK-22800 merge r118133 from trunk

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

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