Bumped file journal ttl to a year and avoided some duplication.

Change-Id: I843969b9c88dc58b23b1277ba0ea79fbf61f6b59