SAK-25574 merge 308282 to 10.x

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