Updates to enable RHC extended tests to run on Fedora 18
Merge pull request #334 from kraman/origin_fixes

Merged by openshift-bot