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

Conflicts:
	enterprise/com/src/test/java/org/neo4j/com/storecopy/RemoteStoreCopierTest.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityModeSwitcher.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java