Merge remote-tracking branch 'neo4j/master' into 2.0

Conflicts:
	community/server/src/test/java/org/neo4j/server/helpers/ServerHelper.java