Merge branch 'master' of git://github.com/jenkinsci/jenkins

core/src/main/java/jenkins/model/TransientActionFactory.java

@@ -24,6 +24,7 @@
 
 package jenkins.model;
 
+import hudson.ExtensionPoint;
 import hudson.model.Action;
 import hudson.model.Actionable;
 import hudson.model.TopLevelItem;
@@ -37,7 +38,7 @@ import javax.annotation.Nonnull;
  * @see Actionable#getAllActions
  * @since 1.548
  */
-public abstract class TransientActionFactory<T> {
+public abstract class TransientActionFactory<T> implements ExtensionPoint {
 
     /**
      * The type of object this factory cares about.

test/src/test/java/hudson/tasks/MavenTest.java

@@ -270,10 +270,10 @@ public class MavenTest {
 
     @Issue("JENKINS-26684")
     @Test public void specialCharsInBuildVariablesPassedAsProperties() throws Exception {
-        j.configureDefaultMaven();
+        MavenInstallation maven = j.configureMaven3();
 
         FreeStyleProject p = j.createFreeStyleProject();
-        p.getBuildersList().add(new Maven("--help", null));
+        p.getBuildersList().add(new Maven("--help", maven.getName()));
         p.addProperty(new ParametersDefinitionProperty(
                 new StringParameterDefinition("tilde", "~"),
                 new StringParameterDefinition("exclamation_mark", "!"),