Merge "RHSM: do not use retry to deploy katello-agent" into stable/pike