Merge "Fix issues with 140_recovery_restart_follower test"