TII-143 merge from branch


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