Merge branch 'master' into JENKINS-34755

Conflicts:
	core/src/main/java/hudson/FilePath.java

core/src/main/java/hudson/PluginManager.java

@@ -559,9 +559,10 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
                 }
 
                 if (dependencyURL != null) {
-                    dependencySet.add(dependencyURL);
                     // And transitive deps...
                     addDependencies(dependencyURL, fromPath, dependencySet);
+                    // And then add the current plugin 
+                    dependencySet.add(dependencyURL);
                 }
             }
         }