bz#969457 making assertion to work further (TODO)
Merge branch 'sat-6.0' of github.com:gkhachik/katello-api into sat-6.0
Merge branch 'sat-6.0' of github.com:gkhachik/katello-api into sat-6.0
automated 968207, #428
Merge pull request #435 from alda519/bz_968207

automated 968207, #428
Merge branch 'sat-6.0' of github.com:gkhachik/katello-api into sat-6.0
fixing tests with regard to latest drop
fixing error message
Refactoring the changes for custom_info