SAK-23276 merge trunk r120425

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