fixed bug: https://bugzilla.redhat.com/show_bug.cgi?id=951231
Merge branch 'sat-6.0' of https://github.com/gkhachik/katello-api into sat-6.0
fixed failing tests