Merge branch '1.5.x'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpoint.java

@@ -164,7 +164,7 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint
 	private Health getHealth(HttpServletRequest request, Principal principal) {
 		Health currentHealth = getCurrentHealth();
 		if (exposeHealthDetails(request, principal)) {
-			return this.cachedHealth.health;
+			return currentHealth;
 		}
 		return Health.status(currentHealth.getStatus()).build();
 	}