Merge branch '5.3.x'

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

spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java

@@ -29,7 +29,7 @@ import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
- * Convenient super class for JDBC-based data access objects.
+ * Convenient superclass for JDBC-based data access objects.
  *
  * <p>Requires a {@link javax.sql.DataSource} to be set, providing a
  * {@link org.springframework.jdbc.core.JdbcTemplate} based on it to