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

Conflicts:
	enterprise/ha/src/test/java/org/neo4j/ha/monitoring/EideticRequestMonitor.java
	enterprise/ha/src/test/java/org/neo4j/ha/monitoring/RemoteRequestMonitoringIT.java