SAK-25695 merge 306708 306715 to 10.x

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