Merge branch '1.3.x'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfiguration.java

@@ -39,6 +39,7 @@ import org.springframework.context.annotation.ConditionContext;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.type.AnnotatedTypeMetadata;
+import org.springframework.web.servlet.mvc.ServletWrappingController;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for embedding Jolokia, a JMX-HTTP
@@ -61,7 +62,7 @@ import org.springframework.core.type.AnnotatedTypeMetadata;
  */
 @Configuration
 @ConditionalOnWebApplication
-@ConditionalOnClass({ AgentServlet.class })
+@ConditionalOnClass({ AgentServlet.class, ServletWrappingController.class })
 @Conditional(JolokiaCondition.class)
 @AutoConfigureBefore(ManagementWebSecurityAutoConfiguration.class)
 @AutoConfigureAfter(EmbeddedServletContainerAutoConfiguration.class)