added hammer objects for global parameter, proxy
Merge pull request #646 from hhovsepy/sat-6.0.2

fixed failing tests by output format changes
Merge branch 'sat-6.0.2' of https://github.com/gkhachik/katello-api into sat-6.0.2
fixed failing test
making test to pass: will fail once the bug fixed: bz#1004248
fixing failures.
manual merge of: alda519-wip_branch
Merge pull request #645 from ab268/sat-6.0.2

added hammer objects for global parameter, proxy
fixing failing test
Merge branch 'sat-6.0.2-drop7' into sat-6.0.2
Merge branch 'sat-6.0.2' of https://github.com/gkhachik/katello-api into sat-6.0.2
fixed failing tests