Cherry-pick #10429 to 6.x: Add rpm packaging rebase#10490

tsg wants to merge 2 commits intoelastic:6.7elastic/beats:6.7from

tsg:backport_10429_6.xtsg/beats:backport_10429_6.xCopy head branch name to clipboard