fixing status check
Merge branch 'tcms' into sat-6.0
Merge branch 'sat-6.0' of https://github.com/gkhachik/katello-api into
sat-6.0

Conflicts:
	src/com/redhat/qe/katello/tests/longrun/ContentTest.java