SAK-27740 merge r311294 from trunk


git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-10.x@311301 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27741 merge r311295 from trunk


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