Fix for JENKINS-16942

https://issues.jenkins-ci.org/browse/JENKINS-16942

PrintWriter.println() uses the OS specific line separator. When
SecretRewriter rewrites the secret file, the lines are converted to the
format of the running OS.  The test case does not account for this.
Since the test case is coded expecting line endings of \n, this fix
converts \r\n to \n before comparing.
Replace \r\n with system property line.separator

Implementing change as suggested by vjuranek
Merge branch 'master' into JENKINS-16942
Merge pull request #745 from rhadman/JENKINS-16942

[FIXED JENKINS-16942] SecretRewriterTest failure on Windows 7