Merge "Fixing FileLogs tests" into ub-launcher3-calgary