EDIT

ref #6591 adapt PESI import to new original spellings handling

cleanup

cleanup

cleanup and use TermTestBase for model tests

ref #9114 add URI Wrapper and replace all java.net.URI occurrences by the wrapper in cdmlib

cleanup

cleanup

improve generics for save() method

cleanup

move model comparators to own package