Bug 998444 - Jenkins fixes.
Merge pull request #3422 from rmillner/BZ998444

Merged by openshift-bot