JENA-1951: Finish merge; remove legacy; adjust for RDF-star
15 files changed