Merge branch '1.4.x' into 1.5.x

Author: wilkinsona

spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java

@@ -144,8 +144,15 @@ public void txSample() throws Exception {
 
 	@Test
 	public void jmsSample() throws Exception {
-		String output = this.cli.run("jms.groovy");
-		assertThat(output).contains("Received Greetings from Spring Boot via Artemis");
+		System.setProperty("spring.artemis.embedded.queues", "spring-boot");
+		try {
+			String output = this.cli.run("jms.groovy");
+			assertThat(output)
+					.contains("Received Greetings from Spring Boot via Artemis");
+		}
+		finally {
+			System.clearProperty("spring.artemis.embedded.queues");
+		}
 	}
 
 	@Test