Forward port fixes to 9.2#2552

mjwolf merged 3 commits intoelastic:9.2elastic/ecs:9.2from

mjwolf:forwardports-9.2mjwolf/ecs:forwardports-9.2Copy head branch name to clipboard