Original commit: elastic/x-pack-elasticsearch@f0462e2f69
This is the xpack side of elastic/elasticsearch#24627 Original commit: elastic/x-pack-elasticsearch@4d1c745d74
Confirmed with @debadair, going ahead with merge Original commit: elastic/x-pack-elasticsearch@c510ddfe9e