SAK-23286 merge trunk r 120445

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