Merge branch '1.2.x'

spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcResponseConverterTests.java

@@ -70,4 +70,5 @@ public class MockMvcResponseConverterTests {
 		assertThat(operationResponse.getHeaders().get(HttpHeaders.SET_COOKIE), equalTo(
 				Collections.singletonList("name=value; Domain=localhost; HttpOnly")));
 	}
+
 }

spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/RestDocumentationRequestBuildersTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 the original author or authors.
+ * Copyright 2014-2017 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.
@@ -157,4 +157,5 @@ public class RestDocumentationRequestBuildersTests {
 		assertThat(request.getRequestURI(), is(equalTo("/uri")));
 		assertThat(request.getMethod(), is(equalTo(httpMethod.name())));
 	}
+
 }