SAK-22318 merge r109481 from trunk

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


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