Merge "Re-enable Generic.Files.OneObjectStructurePerFile sniff"