naming artifact version after version of neo4j
Merge branch '2.0-maint' into 2.1-maint

Conflicts:
	benchmark-run/pom.xml
	data-import/pom.xml