ElasticSearch 0.20.4

Closes #17457.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>