SAK-23395 merged trunk r122221 and had to do some work by hand 


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