sak-23534 merge trunk r123944

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