Cherry-pick #23142 to 7.11: Cherry-pick #22076 to 7.x: Cherry-pick to 7.10: packaging backports#23396

Merged

jsoriano merged 2 commits intoelastic:7.11from jsoriano:backport_23142_7.11

Jan 15, 2021

+144-35

Commits on Jan 7, 2021

Cherry-pick elastic#22076 to 7.x: Cherry-pick to 7.10: packaging backports (elastic#23142 )
jsoriano
committed

Commits on Jan 12, 2021

Merge remote-tracking branch 'origin/7.11' into backport_23142_7.11
jsoriano
committed