Merge pull request #647 from hhovsepy/sat-6.0.2

fixed failing tests
a bit refactoring, small logic change too.
fixed testng deps.
checkKatelloOperational: pings to katello cli; rhsm; hammer cli
fixed failing test