Fix tests on Windows by passing -usejavacp to the compiler used in tests.
Strip windows newlines when comparing test results.
Merge remote-tracking branch 'upstream/master'