Merge branch '1.5.x'

spring-boot/src/main/java/org/springframework/boot/builder/ParentContextApplicationContextInitializer.java

 /*
- * Copyright 2010-2014 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java

 /*
- * Copyright 2010-2015 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

spring-boot/src/main/java/org/springframework/boot/diagnostics/FailureAnalyzers.java

@@ -122,7 +122,7 @@ public final class FailureAnalyzers {
 				}
 			}
 			catch (Throwable ex) {
-				log.debug("FailureAnalyzer " + analyzer + " failed", ex);
+				logger.debug("FailureAnalyzer " + analyzer + " failed", ex);
 			}
 		}
 		return null;

spring-boot/src/main/java/org/springframework/boot/web/support/ServletContextApplicationContextInitializer.java

 /*
- * Copyright 2010-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.