SAK-19147 merge 306392 306395 to 10.x

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

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