WFLY-381 update service orchestration and fix/cleanup module dependencie...

...s