Merge branch '1.9-maint' into merge-1.9-into-master

Conflicts:
	community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
	community/server/src/main/java/org/neo4j/server/logging/SimpleConsoleFormatter.java
	community/server/src/test/java/org/neo4j/server/NeoServerPortConflictDocIT.java
	enterprise/ha/src/test/java/org/neo4j/ha/QuorumWritesIT.java
	enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterManager.java