Cherry-pick #5808 to 6.1: Fix isolation of modules when merging local and global field settings.#5825

Merged

ruflin merged 1 commit intoelastic:6.1from urso:backport_5808_6.1

Dec 8, 2017

+333-10

Commits on Dec 7, 2017

Fix isolation of modules when merging local and global field settings. (elastic#5808 )
Steffen Siering
committed