Sync with 3.1.x

* 3.1.x:
  Demonstrate use of @Configuration as meta-annotation
  Prune dead code from JmsTransactionManager#doBegin
  Apply @Configuration BeanNameGenerator consistently
  Improve @Configuration bean name discovery
  Fix infinite recursion bug in nested @Configuration
  Polish static imports
  Minor fix in ServletResponseMethodArgumentResolver
  extracted ResourceUtils.useCachesIfNecessary(URLConnection) method (SP
  prepared for 3.1.1 release
  CustomSQLExceptionTranslatorRegistry/Registrar etc
  revised CustomSQLExceptionTranslatorRegistry/Registrar method naming
  use custom InputStream traversal instead of a full byte array (SPR-911
  PathMatchingResourcePatternResolver preserves caching for JNLP jar con
  Resource "contentLength()" implementations work with OSGi bundle resou
  fixed MethodInvokingJobDetailFactoryBean for compatibility with Quartz
  fixed MethodInvokingJobDetailFactoryBean for compatibility with Quartz

spring-jms/src/main/java/org/springframework/jms/connection/JmsTransactionManager.java

@@ -87,6 +87,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager
  * @see TransactionAwareConnectionFactoryProxy
  * @see org.springframework.jms.core.JmsTemplate
  */
+@SuppressWarnings("serial")
 public class JmsTransactionManager extends AbstractPlatformTransactionManager
 		implements ResourceTransactionManager, InitializingBean {
 
@@ -191,14 +192,6 @@ public class JmsTransactionManager extends AbstractPlatformTransactionManager
 					getConnectionFactory(), txObject.getResourceHolder());
 		}
 		catch (JMSException ex) {
-			if (session != null) {
-				try {
-					session.close();
-				}
-				catch (Throwable ex2) {
-					// ignore
-				}
-			}
 			if (con != null) {
 				try {
 					con.close();