Merge pull request #2 from olhado/master

Added code for JENKINS-17518