TRUNK-4418 - Fix random failure of ModuleActivatorTest
(cherry picked from commit 1712392cd59472eaa5079c02bfe9ecf661f53e04)