SAK-23816 manual merge of r129776 from trunk


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


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