fixed failing tests
some optimizations
Merge branch 'sat-6.0' of https://github.com/gkhachik/katello-api into
sat-6.0

Conflicts:
	src/com/redhat/qe/katello/tests/e2e/ContentViewRefreshTests.java
Merge pull request #414 from hhovsepy/sat-6.0

fixed failing tests