Merge pull request #633 from hhovsepy/sat-6.0.2

added more tests, fixed failing longrun tests
fixed hanging test
Merge branch 'sat-6.0.2' of https://github.com/gkhachik/katello-api into sat-6.0.2