Follow changes in server.
Merge remote-tracking branch 'neo4j-contrib/master' into tp2.2

Conflicts:
	pom.xml