Merge "remove neo4j classes" into release-1.1.0