Convert two files from crlf to lf line endings

The mixed line endings made it difficult to review diffs on linux
Fix TypeError in componentWillReceiveProps

Added test case to cover this code path. Ran into separate property
update issue.