WFLY-3040 Fix broken dependencies
Merge pull request #6231 from ctomc/modules

WFLY-3040 Fix broken dependencies