Revised newline handling tests pass on Windows now

Issue: SPR-13503
(cherry picked from commit 311d4c9)

Author: jhoeller

spring-webmvc/src/test/java/org/springframework/web/servlet/view/freemarker/FreeMarkerMacroTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -326,6 +326,7 @@ private String getMacroOutput(String name) throws Exception {
 
 		// tokenize output and ignore whitespace
 		String output = response.getContentAsString();
+		output = output.replace("\r\n", "\n");
 		return output.trim();
 	}