EVALSYS-1417 merge r86837 from trunk


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


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