modifications for odcs-conflictresolution refactoring
changed dependency to new Virtuoso Sesame driver
cleanup