added more checks for bz 1011015, fixed failing test
fixed failing longrun tests
Merge branch 'sat-6.0.2' of https://github.com/gkhachik/katello-api into
sat-6.0.2

Conflicts:
	src/com/redhat/qe/katello/tests/longrun/ErrataTests.java
return back longrun tests
Merge pull request #633 from hhovsepy/sat-6.0.2

added more tests, fixed failing longrun tests