SAK-26166 merge 309090 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@313734 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27851 merge 312491 to 10.x

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