EVALSYS-1376 merge r87007 from trunk


git-svn-id: https://source.sakaiproject.org/contrib/evaluation/branches/sakai-10.x@87106 fdecad78-55fc-0310-b1b2-d7d25cf747c9
EVALSYS-744 merge r86999 from trunk


git-svn-id: https://source.sakaiproject.org/contrib/evaluation/branches/sakai-10.x@87107 fdecad78-55fc-0310-b1b2-d7d25cf747c9
EVALSYS-1396 merge r87000 from trunk


git-svn-id: https://source.sakaiproject.org/contrib/evaluation/branches/sakai-10.x@87108 fdecad78-55fc-0310-b1b2-d7d25cf747c9
EVALSYS-1272 merge r87001 from trunk


git-svn-id: https://source.sakaiproject.org/contrib/evaluation/branches/sakai-10.x@87109 fdecad78-55fc-0310-b1b2-d7d25cf747c9
EVALSYS-1412 merge r86998 from trunk


git-svn-id: https://source.sakaiproject.org/contrib/evaluation/branches/sakai-10.x@87110 fdecad78-55fc-0310-b1b2-d7d25cf747c9