closes elastic/elasticsearch#339
closes elastic/elasticsearch#339

Original commit: elastic/x-pack-elasticsearch@2e607325e05928942992f8648950e8a558ae024a

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