Cherry-pick #4772 to 5.6: Fix mixed up modules configuration#4785

Merged

andrewkroh merged 1 commit intoelastic:5.6from tsg:backport_4772_5.6

Jul 31, 2017

+70-40

Commits on Jul 28, 2017

Fix mixed up modules configuration (elastic#4772 )

tsg
authored and
Tudor Golubenco
committed