SAK-23351 merge trunk r121301

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