Merge branch '1.5.x'

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfigurationTests.java

@@ -106,7 +106,7 @@ public class WebSocketMessagingAutoConfigurationTests {
 	@Test
 	public void basicMessagingWithStringResponse() throws Throwable {
 		Object result = performStompSubscription("/app/string");
-		assertThat(new String((byte[]) result)).isEqualTo(String.format("string data"));
+		assertThat(new String((byte[]) result)).isEqualTo("string data");
 	}
 
 	@Test

spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java

@@ -138,7 +138,7 @@ public class YamlConfigurationFactory<T>
 				+ "either set it directly or set the resource to load it from");
 		try {
 			if (this.logger.isTraceEnabled()) {
-				this.logger.trace(String.format("Yaml document is %n%s" + this.yaml));
+				this.logger.trace(String.format("Yaml document is %n%s", this.yaml));
 			}
 			Constructor constructor = new YamlJavaBeanPropertyConstructor(this.type,
 					this.propertyAliases);