SAK-22204 manual fix based in part on SAK-22205 r11275 and umich msub r112258

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