Merge branch '1.9-maint' into 2.0-merge-in-1.9

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/impl/util/StringLogger.java
	community/server/src/main/java/org/neo4j/server/configuration/Configurator.java
	enterprise/backup/src/main/java/org/neo4j/backup/BackupImpl.java
	enterprise/com/src/main/java/org/neo4j/com/ServerUtil.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/DefaultMasterImplSPI.java