(cherry picked from commit 6f7891f3) Conflicts: core/src/main/java/hudson/widgets/RenderOnDemandClosure.java