Merge "Move logic for backup journal into its own class"