update neo4j properties files in test/resources to memory map much less memory
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'