Issue #1 fix - Virtuoso doesn't release resources properly
modifications for new version of odcs-conflictresolution, new configuration format
modifications for new version of odcs-conflictresolution