Merge pull request #846 from mulesoft/MULE-7728

MULE-7728: Fixed flaky test.
(cherry picked from commit 891eec807fb79a8b75aa95b46ddcc89fb3e5c695)

Conflicts:
	core/src/main/java/org/mule/util/store/MuleObjectStoreManager.java
	core/src/test/java/org/mule/util/store/MuleObjectStoreManagerTestCase.java
Merge branch 'mule-3.3.x' of https://github.com/mulesoft/mule into mule-3.3.x