SAk-22369 merge trunk r110470

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