Description of problem:

We are seeing intermittent flakes in the `Should have MCN properties matching associated node properties for nodes in custom MCPs` test in 4.20, as described in TRT-2106. The PR attached to that ticket should helped decrease the flakiness we've seen, but we are still seeing occasional failures (that seem to be issues in other test cleanup) that are impacting our cleanup flow. Thus, we need to make our MCP cleanup flow more robust.

Version-Release number of selected component (if applicable):

4.20, but we saw a failure in 4.19 on 5/11.

How reproducible:

Intermittent

Steps to Reproduce:

• For 4.20 failure, see here.
• For 4.19 failure, see here.

Actual results:

`Should have MCN properties matching associated node properties for nodes in custom MCPs` sometimes fils due to a timeout in the cleanup flow when the worker MCP is waiting to be returned to its original state.

Expected results:

Tests should not flake & no worker nodes should be updating during the `Should have MCN properties matching associated node properties for nodes in custom MCPs` test.

Additional info:

• See TRT-2106 for more info reported by TRT.
• See this Slack thread for more discussion on the issue/background.