2.9.8 changes to trunk

git-svn-id: https://source.sakaiproject.org/contrib/etudes/melete/trunk@87048 fdecad78-55fc-0310-b1b2-d7d25cf747c9
git-svn-id: https://source.sakaiproject.org/contrib/etudes/melete/trunk@87049 fdecad78-55fc-0310-b1b2-d7d25cf747c9