Merge "Made LocalFile avoid duplicate (name,timestamp) pairs"