Cherry-pick to 7.x: Fix problems found during testing (#22562)#22576

Merged

dedemorton merged 1 commit intoelastic:7.xfrom dedemorton:backport/7.x/pr-22562

Nov 16, 2020

+10-10

Commits on Nov 12, 2020

Fix problems found during testing (elastic#22562 )
dedemorton
committed