Fuji: make carriage returns optional (rebased onto develop)



This is the same as gh-776 but rebased onto develop.

----

This allows ```.inf``` files with either CRLF or LF line endings to be parsed correctly.

Nothing really to test other than that the builds are green.