SAK-23755 merge r127028,r127124 from trunk

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