Backport #621 to 1.3: Flesh out the csv a little#640

webmat merged 2 commits intoelastic:1.3elastic/ecs:1.3from

webmat:backport_622_1.3webmat/ecs:backport_622_1.3Copy head branch name to clipboard