Fixing RHC tests for Origin
Merge pull request #453 from kraman/origin_fixes

Merged by openshift-bot