SAK-22445 merge trunk r111187

git-svn-id: https://source.sakaiproject.org/svn/gradebook/branches/sakai-2.8.x@118547 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-19461 merge trunk r103206

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