SAK-27936 merge 313915 from trunk

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

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