Merge "BUG 2437 - Enable snapshotting based on size of data in the in-memory journal"