Fix `make test-robottelo`

Cherry-pick some changes that have been made to `robottelo.api.client` from the master branch on to the satellite-6.0.z.1 branch.