SAK-27767 merge 311902 to 10.x

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