SAK-25698 merge 306134 306343 to 10.x

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