Merge "Refactor raft recovery code to a RaftActorRecoverySupport class"