Merge pull request #1653 from Ichimonji10/satellite-6.0.z.1

Fix `make test-robottelo`