SAK-22814 merge 310253 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-10.x@311365 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27525 merge 311021 to 10.x

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