Cherry-pick #5077 to 6.0: Combine fields.yml properties when they are defined in different sources#5079
Merged
andrewkroh merged 1 commit intoelastic:6.0from exekias:backport_5077_6.0Sep 1, 2017
+83-10
