SAK-25837 merge 307847 307859 to 10.x

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