This is the xpack side of https://github.com/elastic/elasticsearch/pull/25127 Original commit: elastic/x-pack-elasticsearch@e25bd90825
Confirmed with @debadair, going ahead with merge Original commit: elastic/x-pack-elasticsearch@c510ddfe9e