SAK-22397 merge trunk r110567 but only the part that is required for the fix

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