Merging, will push an update to re-enable testing separately Original commit: elastic/x-pack-elasticsearch@3adf3c41d4
Original commit: elastic/x-pack-elasticsearch@80317c063b
Original commit: elastic/x-pack-elasticsearch@46c9bf780a