Followup fix for: Ability to start all modules in their correct order -
TRUNK-4438
(cherry picked from commit 8ac9cd8cf48c15d55d46b787c23002db98709d56)