FLUME-2273 - Add handling for header substitution in ElasticSearchSink

Satoshi Iijima via Juhani Connolly
Merge remote-tracking branch 'remotes/origin/trunk' into trunk