SAK-26030 merge 307720 to 10.x

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

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