INT-3483: Fix `AbstractCorrelatingMH` deadlock

JIRA: https://jira.spring.io/browse/INT-3483

**Cherry-pick to 4.0.x & 3.0.x**

INT-3483 Fix Test Case for < 4.1

JIRA: https://jira.spring.io/browse/INT-3483