Fix several tests that now use incorrect versions
Merge pull request #3390 from pmorie/dev/fix_tests

Merged by openshift-bot