Merge '1.9-maint' into '2.0-maint'

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/AutoConfigurator.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/StoreFactory.java
Needed update for 2.0:
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/DumpStore.java
	enterprise/consistency-check/src/test/java/org/neo4j/consistency/checking/PropertyRecordCheckTest.java