update default neo4j config to be optimized for sf1
Merge branch '2.0-maint' into 2.1-maint

Conflicts:
	data-import/src/test/resources/neo4j_run_dev.properties
update test config to be optimized for sf1
remove unncessary config files
Merge branch '2.0-maint' into 2.1-maint

Conflicts:
	data-import/src/main/resources/neo4j_run_dev.properties
Merge branch '2.1-maint'

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