fix for JENKINS-17551
also fix for JENKINS-17551