Reverting dc20e866 and ba09d205

The bug was actually already fixed and moreover this could cause that fireCompleted won't be called in case that cleanUp throws an exception, see commentes under https://github.com/jenkinsci/jenkins/commit/51f715162eba4dd1c4e081ec15c7ceb12e813ca5

changelog.html

@@ -67,9 +67,6 @@ Upcoming changes</a>
   <li class="major bug">
     Jenkins kicks off the wrong downstream builds for Maven.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15367">issue 15367</a>)
-  <li class=bug>
-    Plugin could break saving of the build
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15825">issue 15825</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

core/src/main/java/hudson/model/Run.java

@@ -1560,11 +1560,12 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
 
                 try {
                     job.cleanUp(listener);
-                    RunListener.fireCompleted(this,listener);
                 } catch (Exception e) {
                     handleFatalBuildProblem(listener,e);
                     // too late to update the result now
                 }
+                    
+                RunListener.fireCompleted(this,listener);
 
                 if(listener!=null)
                     listener.finished(result);