SAK-22683 merge trunk r117238

git-svn-id: https://source.sakaiproject.org/svn/web/branches/sakai-2.9.x@121667 66ffb92e-73f9-0310-93c1-f5514f145a0a