ref #9114 add URI Wrapper and replace all java.net.URI occurrences by the wrapper in cdmlib
cleanup
try to fix test
fix failing tests
Adapt test dataset loading to standard path
Hibernate 4 migration. All test running except for SDDImport (Out of memory)
reintegrating branch ikey-plus-import into trunk
reverting erroneously commits r16027 to r16031
initial working version of ikeyplus import