improve clear-pending-ops to handle new failures as shown in prod
Merge pull request #1660 from rajatchopra/master

Merged by openshift-bot