Merge branch '5.3.x'

# Conflicts:
#	spring-tx/src/main/java/org/springframework/jca/cci/core/support/CciDaoSupport.java

spring-web/src/test/java/org/springframework/web/server/handler/ResponseStatusExceptionHandlerTests.java

@@ -26,6 +26,6 @@ import org.springframework.web.testfixture.server.handler.AbstractResponseStatus
  */
 public class ResponseStatusExceptionHandlerTests extends AbstractResponseStatusExceptionHandlerTests {
 
-	// all tests in super class
+	// all tests in superclass
 
 }