Merge pull request #2114 from ethomson/crlf_redux

Never convert CRLF->LF
Fix filter test for CRLF->LF issues