Fix all the tests in Zuul
Merge pull request #525 from zenoss/feature/fix-zuul-unittests

Fix all the tests in Zuul