Merge branch '2.0.x'

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/liquibase/LiquibaseEndpointTests.java

@@ -79,7 +79,6 @@ public class LiquibaseEndpointTests {
 
 	private boolean getAutoCommit(DataSource dataSource) throws SQLException {
 		try (Connection connection = dataSource.getConnection()) {
-			System.out.println(connection);
 			return connection.getAutoCommit();
 		}
 	}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java

@@ -681,12 +681,9 @@ public class ConfigFileApplicationListener
 		 * @param processedProfiles the processed profiles
 		 */
 		private void resetEnvironmentProfiles(List<Profile> processedProfiles) {
-			String[] names = processedProfiles.stream().filter((profile) -> {
-				if (profile != null && !profile.isDefaultProfile()) {
-					return true;
-				}
-				return false;
-			}).map(Profile::getName).toArray(String[]::new);
+			String[] names = processedProfiles.stream()
+					.filter((profile) -> profile != null && !profile.isDefaultProfile())
+					.map(Profile::getName).toArray(String[]::new);
 			this.environment.setActiveProfiles(names);
 		}
 

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/bind/MapBinderTests.java

@@ -616,7 +616,7 @@ public class MapBinderTests {
 	}
 
 	@Test
-	public void bindToImmutableMapShouldReturnPopulatedCollection() {
+	public void bindToImmutableMapShouldReturnPopulatedMap() {
 		MockConfigurationPropertySource source = new MockConfigurationPropertySource();
 		source.put("foo.values.c", "d");
 		source.put("foo.values.e", "f");