[Merge] Merged with latest master
[Merge] Merged with latest master

Original commit: elastic/x-pack-elasticsearch@b622a9e74b58d2e5556dbca57bce94ca8b198178

strapdata/elassandra,nknize/elasticsearch,strapdata/elassandra,gingerwizard/elasticsearch,uschindler/elasticsearch,GlenRSmith/elasticsearch,robin13/elasticsearch,coding0011/elasticsearch,coding0011/elasticsearch,HonzaKral/elasticsearch,gingerwizard/elasticsearch,HonzaKral/elasticsearch,coding0011/elasticsearch,scorpionvicky/elasticsearch,GlenRSmith/elasticsearch,gingerwizard/elasticsearch,nknize/elasticsearch,robin13/elasticsearch,uschindler/elasticsearch,vroyer/elassandra,vroyer/elassandra,uschindler/elasticsearch,GlenRSmith/elasticsearch,gfyoung/elasticsearch,nknize/elasticsearch,HonzaKral/elasticsearch,robin13/elasticsearch,gfyoung/elasticsearch,gingerwizard/elasticsearch,scorpionvicky/elasticsearch,strapdata/elassandra,robin13/elasticsearch,scorpionvicky/elasticsearch,HonzaKral/elasticsearch,gingerwizard/elasticsearch,GlenRSmith/elasticsearch,uschindler/elasticsearch,uschindler/elasticsearch,robin13/elasticsearch,gingerwizard/elasticsearch,gingerwizard/elasticsearch,GlenRSmith/elasticsearch,gfyoung/elasticsearch,strapdata/elassandra,gfyoung/elasticsearch,scorpionvicky/elasticsearch,vroyer/elassandra,scorpionvicky/elasticsearch,coding0011/elasticsearch,strapdata/elassandra,nknize/elasticsearch,coding0011/elasticsearch,gfyoung/elasticsearch,nknize/elasticsearch