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

[TO_STAGE] improve clear-pending-ops to handle new failures as shown in prod