SAK-25759 merge 306683 306726 306730 to 10.x

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