don't even know what's in here
Merge branch 'stable'
trying to complete rollback
sticking the rollback changes to master
Merge branch 'master' into stable
dialed rhapapi down to a single try for each call