Merge branch '2.2.x' into 2.3.x

Closes gh-22246

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditions.java

 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Condition;
  * be used to create composite conditions, for example:
  *
  * <pre class="code">
- * static class OnNeitherJndiNorProperty extends NoneOfNestedConditions {
+ * static class OnNeitherJndiNorProperty extends NoneNestedConditions {
  *
  *    OnNeitherJndiNorProperty() {
  *        super(ConfigurationPhase.PARSE_CONFIGURATION);