update default neo4j properties file
Merge branch '2.0-maint' into 2.1-maint
update neo4j properties files
Merge branch '2.1-maint'

Conflicts:
	data-import/src/test/resources/neo4j_run_dev.properties