SAK-27945 merge 313969, 313978 from trunk

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