Merge branch '5.3.x'

Author: sbrannen

spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java

@@ -115,7 +115,7 @@ public String getConversationId() {
 		ac.registerBeanDefinition("tb1", bd1);
 
 		GenericBeanDefinition bd2 = new GenericBeanDefinition();
-		bd2.setBeanClassName("#{tb1.class.name}");
+		bd2.setBeanClassName("#{tb1.class}");
 		bd2.setScope("myScope");
 		bd2.getPropertyValues().add("name", "{ XXX#{tb0.name}YYY#{mySpecialAttr}ZZZ }");
 		bd2.getPropertyValues().add("age", "#{mySpecialAttr}");