SAK-22468 merge trunk r111799

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