SAK-23527 merged r127967 into 2.9.x branch

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/assignment-2.9.x@314485 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26038 merged r307757 into 2.9.x branch

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