[1.7] Backport #1134 and #1135#1137

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

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