Merge "Bug 2948: Recovered log entries not applied after prior snapshot"