Use assertIn instead of assertEqual for pillar newline tests
Merge pull request #8442 from cro/fix_file_test

Use assertIn instead of assertEqual for pillar newline tests