Shift to sat 6.0.2

Shifting the PRs for following issues to sat-6.0.2 branch:
#560
#418
https://github.com/gkhachik/katello-api/commit/c1a6dee3019b00e1ffe1e88ca682e0ab30aa189c