SAK-26110 merge 309182 to 10.x

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