Merge pull request #745 from rhadman/JENKINS-16942

[FIXED JENKINS-16942] SecretRewriterTest failure on Windows 7

core/src/test/java/hudson/util/SecretRewriterTest.groovy

@@ -52,7 +52,7 @@ class SecretRewriterTest {
         def f = File.createTempFile("test", "xml", tmp.root)
         f.text = before
         sr.rewrite(f,null)
-        assert after.trim()==f.text.trim()
+        assert after.replaceAll(System.getProperty("line.separator"), "\n").trim()==f.text.replaceAll(System.getProperty("line.separator"), "\n").trim()
     }
 
     String encryptOld(str) {