Neo4j externalization merge back

merging neo4j back to the master