EVALSYS-1424 merging r86941 to make it easier to move this branch into trunk


git-svn-id: https://source.sakaiproject.org/contrib/evaluation/branches/EVALSYS-1413@86993 fdecad78-55fc-0310-b1b2-d7d25cf747c9