Fixing breakage caused in #10174#10340
Merged
ycombinator merged 2 commits intoelastic:6.xfrom Jan 25, 2019
ycombinator:backport_10135_6.x
Merged
Fixing breakage caused in #10174#10340ycombinator merged 2 commits intoelastic:6.xfrom ycombinator:backport_10135_6.x
ycombinator merged 2 commits intoelastic:6.xfrom
ycombinator:backport_10135_6.x