Fix for issue: JENKINS-18633