Fix for JENKINS-17503