SAK-27813 merge r312013 from trunk


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