Handle Jenkins race conditions
Merge pull request #107 from joaquincasares/jenkins_0414

Handle Jenkins race conditions