(cherry picked from commit 454d0f2b) Conflicts: changelog.html core/src/main/java/hudson/model/View.java