Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java

@@ -108,7 +108,7 @@ public class LdapProperties {
 	}
 
 	private int determinePort(Environment environment) {
-		Assert.state(environment != null, "No local LDAP port configured");
+		Assert.notNull(environment, "Environment must not be null");
 		String localPort = environment.getProperty("local.ldap.port");
 		if (localPort != null) {
 			return Integer.valueOf(localPort);