CLC-2901 - Fix line & file endings
https://jira.media.berkeley.edu/jira/browse/CLC-2901
Merge pull request #1862 from christianv/CLC-2901

CLC-2901 - Fix line & file endings