Fixed failed master catch-up after rejoining cluster
Fixes after code review
Merge pull request #2715 from lutovich/1.9-maint

Fixed failed master catch-up after rejoining cluster
Fix compilation error
Merge remote-tracking branch 'upstream/1.9-maint' into 2.0-maint

Conflicts:
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/LearnerState.java
Merge pull request #2733 from davidegrohmann/merge-1.9-into-2.0

Merge 1.9 into 2.0