Merge branch '1.5.x'

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java

@@ -45,6 +45,13 @@ public class ElasticsearchDataAutoConfigurationTests {
 		}
 	}
 
+	@Test
+	public void templateBackOffWithNoClient() {
+		this.context = new AnnotationConfigApplicationContext(
+				ElasticsearchDataAutoConfiguration.class);
+		assertThat(this.context.getBeansOfType(ElasticsearchTemplate.class)).isEmpty();
+	}
+
 	@Test
 	public void templateExists() {
 		this.context = new AnnotationConfigApplicationContext();