Merge pull request #464 from hhovsepy/master

fixed failing tests
for test run to pereserve servers
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:hhovsepy/katello-api