Merge branch '2.0-maint'

Conflicts:
	community/kernel/src/test/java/org/neo4j/test/BatchTransaction.java
	enterprise/consistency-check/pom.xml