Merge branch '2.0-maint' into 2.1-merge-2.0

Conflicts:
	community/kernel/src/main/java/org/neo4j/helpers/Settings.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/ReadOnlyTransactionState.java
	community/kernel/src/test/java/org/neo4j/unsafe/batchinsert/TestBatchInsert.java
	enterprise/cluster/CHANGES.txt
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImpl.java
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/CommonContextState.java
	enterprise/ha/CHANGES.txt