SAK-2252 Merge 314971 from trunk

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