Fixed a test shutdown issue
Merge branch '1.9-maint' into 2.0-merge-in-1.9

Conflicts:
	enterprise/backup/src/test/java/org/neo4j/backup/BackupServiceIT.java