Merge branch '1.4.x' into 1.5.x

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationServletContainerTests.java

@@ -16,6 +16,8 @@
 
 package org.springframework.boot.autoconfigure.jersey;
 
+import java.nio.charset.Charset;
+
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 
@@ -105,7 +107,7 @@ public class JerseyAutoConfigurationServletContainerTests {
 					jerseyServlet.setServlet(new ServletContainer());
 					jerseyServlet.setOverridable(false);
 					context.addChild(jerseyServlet);
-					String pattern = UDecoder.URLDecode("/*", "UTF-8");
+					String pattern = UDecoder.URLDecode("/*", Charset.forName("UTF-8"));
 					context.addServletMappingDecoded(pattern, servletName);
 				}