merges from jenkins-upstream-5