bz#918157 fixed
system task is removed.
Merge branch 'sat6-fix' into sat-6.0.2

Conflicts:
	src/com/redhat/qe/katello/tests/cli/SystemTests.java