FLUME-2155. Index the Flume Event Queue during replay to improve replay time.

(Brock Noland via Hari Shreedharan)
FLUME-1679. Add dependency on Guava to flume-ng-elasticsearch-sink POM

(Andrew Purtell via Hari Shreedharan)
FLUME-2264. Log4j Appender + Avro Reflection on string results in an invalid avro schema

(Brock Noland via Hari Shreedharan)
FLUME-2239. Clarify File Channel's dataDirs setting in User Guide

(Roshan Naik via Hari Shreedharan)
Merge remote-tracking branch 'origin/trunk' into trunk