Merge "Revert "Touch watchdog during object cleanup in max_concurrent tests"" into...