Converted to unix eolns on unix
Merge eoln fixes from the windows branch
One more eoln fix
Merge one more eoln fix