DO NOT MERGE - Testing 7.17 backports#44643

mauri870 wants to merge 4 commits intoelastic:7.17elastic/beats:7.17from

mauri870:test-7.17-backportsmauri870/beats:test-7.17-backportsCopy head branch name to clipboard