SAK-23676 - Remove hybrid from code - 2.9.x merge


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