EVALSYS-1388 update to build with Sakai 10

git-svn-id: https://source.sakaiproject.org/contrib/evaluation/trunk@85511 fdecad78-55fc-0310-b1b2-d7d25cf747c9
EVALSYS-1388 update to build with Sakai 10 (additional cleanup)

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