patch/code regarding bug / feature request JENKINS-18955