Merge pull request #3589 from ntherning/fix-line-ending-issues-in-System.Data-tests