Conflicts: api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ABoxJenaChangeListener.java api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaChangeListener.java api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/ListeningGraph.java