Merge SAK-22226 to 2.8


git-svn-id: https://source.sakaiproject.org/svn/syllabus/branches/sakai-2.8.x@119418 66ffb92e-73f9-0310-93c1-f5514f145a0a