Merge pull request #652 from hhovsepy/sat-6.0.2

fixed failing tests
fixed outputs
Merge branch 'sat-6.0.2' of https://github.com/gkhachik/katello-api into sat-6.0.2
refactoring System / Consumer to smaller pieces. cfse-cli group removed (not used any more)
Merge branch 'tng' into sat-6.0.2
added new hammer objects
Merge branch 'sat-6.0.2' of https://github.com/gkhachik/katello-api into sat-6.0.2