Checking deployment validations for bug 1023381, 1023304
Fixing tests
Merge pull request #4044 from danmcp/master

Merged by openshift-bot