Merge branch '1.2.x'

In addition to the changes already made in 1.2.x, this commit updates
the tests in spring-boot-actuator to ensure that any Elasticsearch
data files are written into the target directory. This avoids problems
when switching branches caused by different versions of Elasticsearch
trying to read the files.

spring-boot-samples/spring-boot-sample-data-elasticsearch/.gitignore

@@ -1 +0,0 @@
-/data

spring-boot-samples/spring-boot-sample-data-elasticsearch/src/test/java/sample/data/elasticsearch/SampleElasticsearchApplicationTests.java

@@ -20,6 +20,7 @@ import java.net.ConnectException;
 
 import org.junit.Rule;
 import org.junit.Test;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.test.OutputCapture;
 import org.springframework.core.NestedCheckedException;
 
@@ -38,7 +39,11 @@ public class SampleElasticsearchApplicationTests {
 	@Test
 	public void testDefaultSettings() throws Exception {
 		try {
-			SampleElasticsearchApplication.main(new String[0]);
+			new SpringApplicationBuilder(SampleElasticsearchApplication.class)
+					.properties(
+							"spring.data.elasticsearch.properties.path.data:target/data",
+							"spring.data.elasticsearch.properties.path.logs:target/logs")
+					.run();
 		}
 		catch (IllegalStateException ex) {
 			if (serverNotRunning(ex)) {