Merge remote-tracking branch 'upstream/1.9-maint' into merge-1.9-into-2.0

Conflicts:
	community/kernel/src/test/java/org/neo4j/kernel/NodeAutoIndexerImplTest.java
	community/kernel/src/test/java/org/neo4j/kernel/lifecycle/LifeSupportTest.java
	community/lucene-index/src/test/java/examples/AutoIndexerExampleTests.java
	enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java
	enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java