Merge "Fix the last Generic.Files.LineLength phpcs failures"