SAK-23369 merge trunk r 121552

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