Merge branch '1.1.x'

spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/consumer/SampleIntegrationApplicationTests.java → spring-boot-samples/spring-boot-sample-parent-context/src/test/java/sample/parent/consumer/SampleIntegrationParentApplicationTests.java

@@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue;
  *
  * @author Dave Syer
  */
-public class SampleIntegrationApplicationTests {
+public class SampleIntegrationParentApplicationTests {
 
 	private static ConfigurableApplicationContext context;