Merge branch '2.0.x'

Author: philwebb

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EndpointIdTests.java

@@ -41,8 +41,8 @@ public void ofWhenEmptyThrowsException() {
 	}
 
 	@Test
-	public void ofWhenContainsInvalidCharThrowsException() {
-		assertThatIllegalArgumentException().isThrownBy(() -> EndpointId.of("foo!bar"))
+	public void ofWhenContainsSlashThrowsException() {
+		assertThatIllegalArgumentException().isThrownBy(() -> EndpointId.of("foo/bar"))
 				.withMessage("Value must only contain valid chars");
 	}