trying to complete rollback
Merge branch 'master' into stable
dialed rhapapi down to a single try for each call