SAK-23507 2.9.x merge with manual conflict resolution



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