SAK-26044 merge 307796 307798 307799 to 10.x

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