SAK-23553 merge r123360 from trunk

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

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