Merge remote-tracking branch 'origin/master' into mt-model-builder

# Conflicts:
#	maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
#	maven-core/src/main/java/org/apache/maven/project/ReactorModelPool.java
#	maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultBuildPomXMLFilterFactory.java
#	maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
#	maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultTransformerContext.java
#	maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
#	maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
#	maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileSelector.java
#	maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
#	maven-model-transform/src/main/java/org/apache/maven/model/transform/BuildToRawPomXMLFilterFactory.java
#	maven-model-transform/src/main/java/org/apache/maven/model/transform/ParentXMLFilter.java
#	maven-model-transform/src/main/java/org/apache/maven/model/transform/ReactorDependencyXMLFilter.java
#	maven-model-transform/src/test/java/org/apache/maven/model/transform/ConsumerPomXMLFilterTest.java
#	maven-model-transform/src/test/java/org/apache/maven/model/transform/ReactorDependencyXMLFilterTest.java
#	maven-resolver-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelCache.java

maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java

@@ -25,6 +25,8 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 
+import static java.util.stream.Collectors.toMap;
+
 /**
  * Describes the environmental context used to determine the activation status of profiles.
  *