system tests fixes

Couple of fixes to system tests.

After getting this in all system tests should be green

https://github.com/Katello/katello/pull/2585