use Neo4j 2.0.4 instead of 2.0.5-SNAPSHOT
using jdbc 2.0
Merge branch '2.0-maint' into 2.1-maint

Conflicts:
	pom.xml