EVALSYS-1401 merge r86721,86723,86726 from trunk


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


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