Merge branch '1.2.x'

spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java

@@ -146,7 +146,7 @@ public class UndertowEmbeddedServletContainerFactoryTests extends
 			}
 		});
 		this.container = factory.getEmbeddedServletContainer();
-		assertEquals("", contextPath.get());
+		assertEquals("/", contextPath.get());
 	}
 
 }