INT-3483: Fix `AbstractCorrelatingMH` deadlock

JIRA: https://jira.spring.io/browse/INT-3483

**Cherry-pick to 4.0.x & 3.0.x**
Re. asterisk imports for static methods:
Since we don't use static imports for core code it isn't an issue at all.
For tests is is really usefull, when all `Assert` or `Mockito` methods are here, and I don't spend time to find appropriate method from there.