Make tracking and reporting of active ops more robust in OperationCancellationTestCase
Merge pull request #6430 from bstansberry/fix-opcantest

Make tracking and reporting of active ops more robust in OperationCancel...