FLUME-2346. idLogFileMap in Log can lose track of file ids.

(Johny Rufus via Hari)
FLUME-2472. SyslogUtils fails when system locale is not English

(Santiago M. Mola via Hari)
FLUME-2489. Upgrade Apache Curator to 2.6.0

(Santiago M. Mola via Hari)
Merge remote-tracking branch 'remotes/origin/trunk' into trunk