Full merge of neo4j2.  Deadlock improvements, library upgrades.