EVALSYS-1427 merge r86685 from VULA


git-svn-id: https://source.sakaiproject.org/contrib/evaluation/trunk@87132 fdecad78-55fc-0310-b1b2-d7d25cf747c9