Modify some test setups to work correctly in Origin context
Merge pull request #4966 from nhr/test_fixes

Merged by openshift-bot