Merge remote-tracking branch 'upstream/2.1' into enhance/node-offline-status

Original commit: elastic/x-pack-elasticsearch@1f60bfb379
This commit is contained in:
Khalah Jones-Golden 2015-11-11 11:37:10 -04:00
commit 47df543c52

Diff Content Not Available