Merge pull request #916 from afs/iri-more

JENA-2039: Fix and tests (IRI handling), and more IRI cleanup (JENA-2031)