SAK-23040 reverse merge 122227:122226


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