Committing changes for 2.9.6 release

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