bz#918157 fixed
Merge pull request #629 from ab268/disconnected-sat-6.0.2

katello-disconnect enable/disable repo tests
system task is removed.
Merge branch 'sat6-fix' into sat-6.0.2

Conflicts:
	src/com/redhat/qe/katello/tests/cli/SystemTests.java
bz#1016134 verified
Merge branch 'sat6-fix' into sat-6.0.2