Fix JENKINS-18574
Merge pull request #73 from cbos/master

Fix JENKINS-22199