(cherry picked from commit 08efdf5d) Conflicts: changelog.html core/src/main/java/hudson/widgets/RenderOnDemandClosure.java