diff --git a/changelog.html b/changelog.html
index e3949d2bc599e727027354a35397fc713990b625..494b3fa505e1239a07c2dd0dc7b5014e493f5daa 100644
--- a/changelog.html
+++ b/changelog.html
@@ -63,6 +63,9 @@ Upcoming changes
NPE from MatrixConfiguration.newBuild
.
(issue 17728)
+
+ NPE configuring Copy Artifact with Maven jobs.
+ (issue 17402)
/about
now links to license information for plugins as well.
diff --git a/core/src/main/java/hudson/model/ItemGroup.java b/core/src/main/java/hudson/model/ItemGroup.java
index 9c7fe37d7cc45bdcb67c29e92bb9582f5391f09d..a87814eb9d8a8423e64c0c8401958084c48f2bfb 100644
--- a/core/src/main/java/hudson/model/ItemGroup.java
+++ b/core/src/main/java/hudson/model/ItemGroup.java
@@ -26,6 +26,7 @@ package hudson.model;
import java.io.IOException;
import java.util.Collection;
import java.io.File;
+import javax.annotation.CheckForNull;
/**
* Represents a grouping inherent to a kind of {@link Item}s.
@@ -64,9 +65,9 @@ public interface ItemGroup extends PersistenceRoot, ModelObject
String getUrlChildPrefix();
/**
- * Gets the {@link Item} inside this group that has a given name.
+ * Gets the {@link Item} inside this group that has a given name, or null if it does not exist.
*/
- T getItem(String name);
+ @CheckForNull T getItem(String name);
/**
* Assigns the {@link Item#getRootDir() root directory} for children.
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
index 31c594da425f35813279b990711c68582cc3e4a6..d17b8be66a0143d966db8cbab8955b1856934f69 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
@@ -434,7 +434,11 @@ public class MavenModuleSet extends AbstractMavenProject