[1.6] Backport #1134 and #1135#1138

webmat merged 1 commit intoelastic:1.6elastic/ecs:1.6from

webmat:backport/1.6/1134-1135webmat/ecs:backport/1.6/1134-1135Copy head branch name to clipboard